diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-08-07 19:40:45 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-10 13:36:43 -0700 |
| commit | a7854037da006a7472c48773e3190db55217ec9b (patch) | |
| tree | e8a4d43fe4dc2d7c0e32f6022d293c9814edf257 /net/bridge/br_vlan.c | |
| parent | Merge branch 'qlcnic-enhancements' (diff) | |
| download | linux-dev-a7854037da006a7472c48773e3190db55217ec9b.tar.xz linux-dev-a7854037da006a7472c48773e3190db55217ec9b.zip | |
bridge: netlink: add support for vlan_filtering attribute
This patch adds the ability to toggle the vlan filtering support via
netlink. Since we're already running with rtnl in .changelink() we don't
need to take any additional locks.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_vlan.c')
| -rw-r--r-- | net/bridge/br_vlan.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 0d41f81838ff..3cef6892c0bb 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -468,21 +468,27 @@ void br_recalculate_fwd_mask(struct net_bridge *br) ~(1u << br->group_addr[5]); } -int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val) +int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val) { - if (!rtnl_trylock()) - return restart_syscall(); - if (br->vlan_enabled == val) - goto unlock; + return 0; br->vlan_enabled = val; br_manage_promisc(br); recalculate_group_addr(br); br_recalculate_fwd_mask(br); -unlock: + return 0; +} + +int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val) +{ + if (!rtnl_trylock()) + return restart_syscall(); + + __br_vlan_filter_toggle(br, val); rtnl_unlock(); + return 0; } |