From 58da018053531b9cb91423a64f2a762ef0fe7456 Mon Sep 17 00:00:00 2001 From: Nikolay Aleksandrov Date: Tue, 4 Aug 2015 01:19:58 +0200 Subject: bridge: mdb: fix vlan_enabled access when vlans are not configured Instead of trying to access br->vlan_enabled directly use the provided helper br_vlan_enabled(). Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller --- net/bridge/br_mdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/bridge') diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 1df3ef4a73b9..d747275fad18 100644 --- 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); -- cgit v1.2.3-59-g8ed1b