ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: bridge: check vlan with eth_type_vlan() method

Browse Source 
Replace some checks for ETH_P_8021Q and ETH_P_8021AD with
eth_type_vlan().

Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Link: https://lore.kernel.org/r/20210117080950.122761-1-dong.menglong@zte.com.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Menglong Dong
2021-01-17 16:09:50 +08:00
committed by Jakub Kicinski
parent 220723dc3b
commit a98c0c4742
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/bridge/br_forward.c
View File

@@ -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); br_drop_fake_rtable(skb);
if (skb->ip_summed == CHECKSUM_PARTIAL && if (skb->ip_summed == CHECKSUM_PARTIAL &&
(skb->protocol == htons(ETH_P_8021Q) || eth_type_vlan(skb->protocol)) {
skb->protocol == htons(ETH_P_8021AD))) {
int depth; int depth;
if (!__vlan_get_protocol(skb, skb->protocol, &depth)) if (!__vlan_get_protocol(skb, skb->protocol, &depth))

12
net/bridge/br_netlink.c
View File

@@ -1096,15 +1096,9 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[],
return 0; return 0;
#ifdef CONFIG_BRIDGE_VLAN_FILTERING #ifdef CONFIG_BRIDGE_VLAN_FILTERING
if (data[IFLA_BR_VLAN_PROTOCOL]) { if (data[IFLA_BR_VLAN_PROTOCOL] &&
switch (nla_get_be16(data[IFLA_BR_VLAN_PROTOCOL])) { !eth_type_vlan(nla_get_be16(data[IFLA_BR_VLAN_PROTOCOL])))
case htons(ETH_P_8021Q): return -EPROTONOSUPPORT;
case htons(ETH_P_8021AD):
break;
default:
return -EPROTONOSUPPORT;
}
}
if (data[IFLA_BR_VLAN_DEFAULT_PVID]) { if (data[IFLA_BR_VLAN_DEFAULT_PVID]) {
__u16 defpvid = nla_get_u16(data[IFLA_BR_VLAN_DEFAULT_PVID]); __u16 defpvid = nla_get_u16(data[IFLA_BR_VLAN_DEFAULT_PVID]);

2
net/bridge/br_vlan.c
View File

@@ -917,7 +917,7 @@ err_filt:
int br_vlan_set_proto(struct net_bridge *br, unsigned long val) int br_vlan_set_proto(struct net_bridge *br, unsigned long val)
{ {
if (val != ETH_P_8021Q && val != ETH_P_8021AD) if (!eth_type_vlan(htons(val)))
return -EPROTONOSUPPORT; return -EPROTONOSUPPORT;
return __br_vlan_set_proto(br, htons(val)); return __br_vlan_set_proto(br, htons(val));