From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolay Aleksandrov Subject: [PATCH net-next 3/4] bridge: vlan: drop master_flags from __vlan_add Date: Fri, 2 Oct 2015 15:05:12 +0200 Message-ID: <1443791113-12738-4-git-send-email-razor@blackwall.org> References: <1443791113-12738-1-git-send-email-razor@blackwall.org> Cc: Nikolay Aleksandrov , roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, davem@davemloft.net, vyasevich@gmail.com To: netdev@vger.kernel.org Return-path: In-Reply-To: <1443791113-12738-1-git-send-email-razor@blackwall.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: bridge-bounces@lists.linux-foundation.org Errors-To: bridge-bounces@lists.linux-foundation.org List-Id: netdev.vger.kernel.org From: Nikolay Aleksandrov There's only one user now and we can include the flag directly. Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_vlan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 8481d2567513..1f6f9f5b2c73 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -210,8 +210,6 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags) } if (p) { - u16 master_flags = flags; - /* Add VLAN to the device filter if it is supported. * This ensures tagged traffic enters the bridge when * promiscuous mode is disabled by br_manage_promisc(). @@ -222,8 +220,8 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags) /* need to work on the master vlan too */ if (flags & BRIDGE_VLAN_INFO_MASTER) { - master_flags |= BRIDGE_VLAN_INFO_BRENTRY; - err = br_vlan_add(br, v->vid, master_flags); + err = br_vlan_add(br, v->vid, flags | + BRIDGE_VLAN_INFO_BRENTRY); if (err) goto out_filt; } -- 2.4.3