Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[mirror_ubuntu-bionic-kernel.git] / net / bridge / br_vlan.c

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 1394da63614a1d8a325ef44d5fa17849b5d82294..85e43af4af7a5b2956b149479725fce96c343439 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -73,6 +73,7 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
                          u16 vid, u16 flags)
 {
        struct switchdev_obj_port_vlan v = {
+               .obj.orig_dev = dev,
                .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,
                .flags = flags,
                .vid_begin = vid,
@@ -120,6 +121,7 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
                          u16 vid)
 {
        struct switchdev_obj_port_vlan v = {
+               .obj.orig_dev = dev,
                .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,
                .vid_begin = vid,
                .vid_end = vid,
@@ -624,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);
@@ -637,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)
@@ -891,6 +907,12 @@ err_rhtbl:
 
 int nbp_vlan_init(struct net_bridge_port *p)
 {
+       struct switchdev_attr attr = {
+               .orig_dev = p->br->dev,
+               .id = SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING,
+               .flags = SWITCHDEV_F_SKIP_EOPNOTSUPP,
+               .u.vlan_filtering = p->br->vlan_enabled,
+       };
        struct net_bridge_vlan_group *vg;
        int ret = -ENOMEM;
 
@@ -898,6 +920,10 @@ int nbp_vlan_init(struct net_bridge_port *p)
        if (!vg)
                goto out;
 
+       ret = switchdev_port_attr_set(p->dev, &attr);
+       if (ret && ret != -EOPNOTSUPP)
+               goto err_vlan_enabled;
+
        ret = rhashtable_init(&vg->vlan_hash, &br_vlan_rht_params);
        if (ret)
                goto err_rhtbl;
@@ -917,6 +943,7 @@ err_vlan_add:
        RCU_INIT_POINTER(p->vlgrp, NULL);
        synchronize_rcu();
        rhashtable_destroy(&vg->vlan_hash);
+err_vlan_enabled:
 err_rhtbl:
        kfree(vg);