Merge tag 'arm-late-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / net / bridge / br_mdb.c

diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index fdcc641..589ff49 100644 (file)
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -1025,8 +1025,8 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,
                        NL_SET_ERR_MSG_MOD(extack, "Port belongs to a different bridge device");
                        return -EINVAL;
                }
-               if (p->state == BR_STATE_DISABLED) {
-                       NL_SET_ERR_MSG_MOD(extack, "Port is in disabled state");
+               if (p->state == BR_STATE_DISABLED && entry->state != MDB_PERMANENT) {
+                       NL_SET_ERR_MSG_MOD(extack, "Port is in disabled state and entry is not permanent");
                        return -EINVAL;
                }
                vg = nbp_vlan_group(p);
@@ -1086,9 +1086,6 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry,
                if (!p->key.port || p->key.port->dev->ifindex != entry->ifindex)
                        continue;
 
-               if (p->key.port->state == BR_STATE_DISABLED)
-                       goto unlock;
-
                br_multicast_del_pg(mp, p, pp);
                err = 0;
                break;
@@ -1124,8 +1121,14 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
                        return -ENODEV;
 
                p = br_port_get_rtnl(pdev);
-               if (!p || p->br != br || p->state == BR_STATE_DISABLED)
+               if (!p) {
+                       NL_SET_ERR_MSG_MOD(extack, "Net device is not a bridge port");
+                       return -EINVAL;
+               }
+               if (p->br != br) {
+                       NL_SET_ERR_MSG_MOD(extack, "Port belongs to a different bridge device");
                        return -EINVAL;
+               }
                vg = nbp_vlan_group(p);
        } else {
                vg = br_vlan_group(br);