projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.11' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
net
/
bridge
/
br_netlink.c
diff --git
a/net/bridge/br_netlink.c
b/net/bridge/br_netlink.c
index 1fc30abd3a523912376ce01fcae932f3b6b8c746..b9259efa636ef8fe2b79ec25de49a16efa9034db 100644
(file)
--- a/
net/bridge/br_netlink.c
+++ b/
net/bridge/br_netlink.c
@@
-132,7
+132,7
@@
static int br_fill_ifinfo(struct sk_buff *skb,
else
pv = br_get_vlan_info(br);
else
pv = br_get_vlan_info(br);
- if (!pv || bitmap_empty(pv->vlan_bitmap,
BR_VLAN_BITMAP_LEN
))
+ if (!pv || bitmap_empty(pv->vlan_bitmap,
VLAN_N_VID
))
goto done;
af = nla_nest_start(skb, IFLA_AF_SPEC);
goto done;
af = nla_nest_start(skb, IFLA_AF_SPEC);
@@
-140,7
+140,7
@@
static int br_fill_ifinfo(struct sk_buff *skb,
goto nla_put_failure;
pvid = br_get_pvid(pv);
goto nla_put_failure;
pvid = br_get_pvid(pv);
- for_each_set_bit(vid, pv->vlan_bitmap,
BR_VLAN_BITMAP_LEN
) {
+ for_each_set_bit(vid, pv->vlan_bitmap,
VLAN_N_VID
) {
vinfo.vid = vid;
vinfo.flags = 0;
if (vid == pvid)
vinfo.vid = vid;
vinfo.flags = 0;
if (vid == pvid)