redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

bridge: add vlan filtering change notification 

Notifying hardware about bridge vlan-aware changes.

Signed-off-by: Elad Raz <eladr@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
steinar/wifi_calib_4_9_kernel
Elad Raz 2016-01-06 13:01:06 +01:00 committed by David S. Miller
parent 81435c33e0
commit 6b72a77020
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/bridge/br_vlan.c
View File

@ -626,9 +626,21 @@ void br_recalculate_fwd_mask(struct net_bridge *br)
int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)
{
struct switchdev_attr attr = {
.orig_dev = br->dev,
.id = SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING,
.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP,
.u.vlan_filtering = val,
};
int err;
if (br->vlan_enabled == val)
return 0;
err = switchdev_port_attr_set(br->dev, &attr);
if (err && err != -EOPNOTSUPP)
return err;
br->vlan_enabled = val;
br_manage_promisc(br);
recalculate_group_addr(br);
@ -639,13 +651,15 @@ int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)
int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)
{
int err;
if (!rtnl_trylock())
return restart_syscall();
__br_vlan_filter_toggle(br, val);
err = __br_vlan_filter_toggle(br, val);
rtnl_unlock();
return 0;
return err;
}
int __br_vlan_set_proto(struct net_bridge *br, __be16 proto)