diff options
| author | Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> | 2013-08-20 17:10:18 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-20 23:35:57 -0700 |
| commit | ef40b7ef181b7b1a24df2ef2d1ef84956bffa635 (patch) | |
| tree | b548a3f90460d4dbdd740b0e823fd314a519b829 /net/bridge/br_netlink.c | |
| parent | 5c751c9344fce32cebc1c53514644e625a484916 (diff) | |
| download | linux-ef40b7ef181b7b1a24df2ef2d1ef84956bffa635.tar.gz linux-ef40b7ef181b7b1a24df2ef2d1ef84956bffa635.tar.bz2 linux-ef40b7ef181b7b1a24df2ef2d1ef84956bffa635.zip | |
bridge: Use the correct bit length for bitmap functions in the VLAN code
The VLAN code needs to know the length of the per-port VLAN bitmap to
perform its most basic operations (retrieving VLAN informations, removing
VLANs, forwarding database manipulation, etc). Unfortunately, in the
current implementation we are using a macro that indicates the bitmap
size in longs in places where the size in bits is expected, which in
some cases can cause what appear to be random failures.
Use the correct macro.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
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) |