| Message ID | 20210114075101.6501-1-dong.menglong@zte.com.cn (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: bridge: use eth_type_vlan in br_dev_queue_push_xmit | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 9 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On 14/01/2021 09:51, menglong8.dong@gmail.com wrote: > From: Menglong Dong <dong.menglong@zte.com.cn> > > Replace the check for ETH_P_8021Q and ETH_P_8021AD in > br_dev_queue_push_xmit with eth_type_vlan. > > Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn> > --- > net/bridge/br_forward.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c > index e28ffadd1371..6e9b049ae521 100644 > --- a/net/bridge/br_forward.c > +++ b/net/bridge/br_forward.c > @@ -39,8 +39,7 @@ int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb > br_drop_fake_rtable(skb); > > if (skb->ip_summed == CHECKSUM_PARTIAL && > - (skb->protocol == htons(ETH_P_8021Q) || > - skb->protocol == htons(ETH_P_8021AD))) { > + eth_type_vlan(skb->protocol)) { > int depth; > > if (!__vlan_get_protocol(skb, skb->protocol, &depth)) > Please change all similar checks, there are also: br_netlink.c - br_validate() br_vlan.c - br_vlan_set_proto() Thanks.
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index e28ffadd1371..6e9b049ae521 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -39,8 +39,7 @@ int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb br_drop_fake_rtable(skb); if (skb->ip_summed == CHECKSUM_PARTIAL && - (skb->protocol == htons(ETH_P_8021Q) || - skb->protocol == htons(ETH_P_8021AD))) { + eth_type_vlan(skb->protocol)) { int depth; if (!__vlan_get_protocol(skb, skb->protocol, &depth))