diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-10-02 15:05:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-04 16:43:49 -0700 |
| commit | 2ffdf508d278d48ccb928238846df352db21f4eb (patch) | |
| tree | c32baa0bab3e05c909d03054cdbbe9eb2bb20606 /net/bridge/br_vlan.c | |
| parent | f8ed289fab843fbc9251aa2f5c3d416f09b5fc7e (diff) | |
| download | linux-2ffdf508d278d48ccb928238846df352db21f4eb.tar.bz2 | |
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>
Diffstat (limited to 'net/bridge/br_vlan.c')
| -rw-r--r-- | net/bridge/br_vlan.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 6e41fba47e97..2c1fdf94badc 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -212,8 +212,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(). @@ -224,8 +222,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; } |