diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 21:18:13 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 21:18:13 +0200 |
| commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
| tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /net/bridge/br_netlink.c | |
| parent | include: dt-binding: input: create a DT header defining key codes. (diff) | |
| parent | Linux 3.11-rc7 (diff) | |
| download | linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.tar.xz linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.zip | |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'net/bridge/br_netlink.c')
| -rw-r--r-- | net/bridge/br_netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 1fc30abd3a52..b9259efa636e 100644 --- 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); - 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); @@ -140,7 +140,7 @@ static int br_fill_ifinfo(struct sk_buff *skb, 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) |