Commit 2ffdf508 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

bridge: vlan: drop master_flags from __vlan_add 



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

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8ed289f

net/bridge/br_vlan.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

		}