]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
bridge: Fix setting a flag in br_fill_ifvlaninfo_range().
authorRosen, Rami <rami.rosen@intel.com>
Wed, 22 Jul 2015 04:57:02 +0000 (07:57 +0300)
committerDavid S. Miller <davem@davemloft.net>
Sat, 25 Jul 2015 05:56:22 +0000 (22:56 -0700)
This patch fixes setting of vinfo.flags in the br_fill_ifvlaninfo_range() method. The
assignment of vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN has no effect and is
unneeded, as vinfo.flags value is overriden by the  immediately following
vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END assignement.

Signed-off-by: Rami Rosen <rami.rosen@intel.com>
Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_netlink.c

index 364bdc98bd9bef003dfe4f17a1f2ac3048c0bd02..793d247ac2ca220e2d3812033b3f4d7b623bc847 100644 (file)
@@ -164,8 +164,6 @@ static int br_fill_ifvlaninfo_range(struct sk_buff *skb, u16 vid_start,
                            sizeof(vinfo), &vinfo))
                        goto nla_put_failure;
 
-               vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN;
-
                vinfo.vid = vid_end;
                vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END;
                if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO,