diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-09-30 20:16:53 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-01 18:24:04 -0700 |
| commit | 77751ee8aec3e1748e0d1471ccbfc008793e88a6 (patch) | |
| tree | 65776b5154f1e6222c0fea5436cf123a5132be8b /net/bridge/br_device.c | |
| parent | bridge: vlan: fix possible null vlgrp deref while registering new port (diff) | |
| download | linux-dev-77751ee8aec3e1748e0d1471ccbfc008793e88a6.tar.xz linux-dev-77751ee8aec3e1748e0d1471ccbfc008793e88a6.zip | |
bridge: vlan: move pvid inside net_bridge_vlan_group
One obvious way to converge more code (which was also used by the
previous vlan code) is to move pvid inside net_bridge_vlan_group. This
allows us to simplify some and remove other port-specific functions.
Also gives us the ability to simply pass the vlan group and use all of the
contained information.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_device.c')
| -rw-r--r-- | net/bridge/br_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index c915c5b408ea..bdfb9544ca03 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -56,7 +56,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) skb_reset_mac_header(skb); skb_pull(skb, ETH_HLEN); - if (!br_allowed_ingress(br, skb, &vid)) + if (!br_allowed_ingress(br, br_vlan_group(br), skb, &vid)) goto out; if (is_broadcast_ether_addr(dest)) |