bridge: mdb: fix vlan_enabled access when vlans are not configured

[cascardo/linux.git] / net / bridge / br_mdb.c

diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 1df3ef4..d747275 100644 (file)
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -490,7 +490,7 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh)
                return -EINVAL;
 
        pv = nbp_get_vlan_info(p);
-       if (br->vlan_enabled && pv && entry->vid == 0) {
+       if (br_vlan_enabled(br) && pv && entry->vid == 0) {
                for_each_set_bit(vid, pv->vlan_bitmap, VLAN_N_VID) {
                        entry->vid = vid;
                        err = __br_mdb_add(net, br, entry);
@@ -592,7 +592,7 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh)
                return -EINVAL;
 
        pv = nbp_get_vlan_info(p);
-       if (br->vlan_enabled && pv && entry->vid == 0) {
+       if (br_vlan_enabled(br) && pv && entry->vid == 0) {
                for_each_set_bit(vid, pv->vlan_bitmap, VLAN_N_VID) {
                        entry->vid = vid;
                        err = __br_mdb_del(br, entry);