bridge: add vlan filtering change notification
authorElad Raz <eladr@mellanox.com>
Wed, 6 Jan 2016 12:01:06 +0000 (13:01 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Jan 2016 19:42:40 +0000 (14:42 -0500)
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>
net/bridge/br_vlan.c

index 66c4549efbbb3505831587baaeaf7c0d55be1607..190fb3372ab57e74a15a3439516819bdd29a3b42 100644 (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)