[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1431700047-22560-1-git-send-email-rami.rosen@intel.com>
Date: Fri, 15 May 2015 17:27:27 +0300
From: Rami Rosen <rami.rosen@...el.com>
To: davem@...emloft.net
Cc: netdev@...r.kernel.org, roopa@...ulusnetworks.com,
ronen.arad@...el.com, Rami Rosen <rami.rosen@...el.com>
Subject: [PATCH net-next] bridge: Fix setting a flag in br_fill_ifvlaninfo_range().
This patch fixes setting of vinfo.flags in the br_fill_ifvlaninfo_range(). The
assignment of vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN has no effect without
this patch, as vinfo.flags value is overriden by the
vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END assignement, which follows
it immedialtely.
Signed-off-by: Rami Rosen <rami.rosen@...el.com>
---
net/bridge/br_netlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 6b67ed3..fec65bb 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -167,7 +167,7 @@ static int br_fill_ifvlaninfo_range(struct sk_buff *skb, u16 vid_start,
vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN;
vinfo.vid = vid_end;
- vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END;
+ vinfo.flags &= flags | BRIDGE_VLAN_INFO_RANGE_END;
if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO,
sizeof(vinfo), &vinfo))
goto nla_put_failure;
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists