p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bridge: vlan: drop master_flags from __vlan_add 

There's only one user now and we can include the flag directly.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2015-10-02 15:05:12 +02:00 committed by David S. Miller
parent f8ed289fab
commit 2ffdf508d2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/bridge/br_vlan.c
View File

@ -212,8 +212,6 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)
} }
if (p) { if (p) {
u16 master_flags = flags;
/* Add VLAN to the device filter if it is supported. /* Add VLAN to the device filter if it is supported.
* This ensures tagged traffic enters the bridge when * This ensures tagged traffic enters the bridge when
* promiscuous mode is disabled by br_manage_promisc(). * promiscuous mode is disabled by br_manage_promisc().
@ -224,8 +222,8 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)
/* need to work on the master vlan too */ /* need to work on the master vlan too */
if (flags & BRIDGE_VLAN_INFO_MASTER) { if (flags & BRIDGE_VLAN_INFO_MASTER) {
master_flags |= BRIDGE_VLAN_INFO_BRENTRY; err = br_vlan_add(br, v->vid, flags |
err = br_vlan_add(br, v->vid, master_flags); BRIDGE_VLAN_INFO_BRENTRY);
if (err) if (err)
goto out_filt; goto out_filt;
} }