aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen, Rami <rami.rosen@intel.com>2015-07-22 00:57:02 -0400
committerDavid S. Miller <davem@davemloft.net>2015-07-25 01:56:22 -0400
commit6ca91c604074788dfeb7dd714e74f0ad6bea8a77 (patch)
tree6c86534cb872c0ebfe61f558fc69924d93c51e7b
parenta155a5db9389c4088c0901e665002332f2503660 (diff)
bridge: Fix setting a flag in br_fill_ifvlaninfo_range().
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>
-rw-r--r--net/bridge/br_netlink.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 364bdc98bd9b..793d247ac2ca 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -164,8 +164,6 @@ static int br_fill_ifvlaninfo_range(struct sk_buff *skb, u16 vid_start,
164 sizeof(vinfo), &vinfo)) 164 sizeof(vinfo), &vinfo))
165 goto nla_put_failure; 165 goto nla_put_failure;
166 166
167 vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN;
168
169 vinfo.vid = vid_end; 167 vinfo.vid = vid_end;
170 vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END; 168 vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END;
171 if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO, 169 if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO,