Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 763e0ecd authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

bonding: allow to add vlans on top of empty bond 



This limitation maybe had some reason in the past, but now there is not
one -> removing this.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarVeaceslav Falico <vfalico@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 813f8e29

drivers/net/bonding/bond_main.c

+0 −13
Original line number Diff line number Diff line
@@ -1001,12 +1001,6 @@ static netdev_features_t bond_fix_features(struct net_device *dev, 
	netdev_features_t mask;

	struct slave *slave;



	if (!bond_has_slaves(bond)) {

		/* Disable adding VLANs to empty bond. But why? --mq */

		features |= NETIF_F_VLAN_CHALLENGED;

		return features;

	}



	mask = features;

	features &= ~NETIF_F_ONE_FOR_ALL;

	features |= NETIF_F_ALL_FOR_ALL;
@@ -3956,13 +3950,6 @@ void bond_setup(struct net_device *bond_dev) 
	bond_dev->priv_flags |= IFF_BONDING | IFF_UNICAST_FLT;

	bond_dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);



	/* At first, we block adding VLANs. That's the only way to

	 * prevent problems that occur when adding VLANs over an

	 * empty bond. The block will be removed once non-challenged

	 * slaves are enslaved.

	 */

	bond_dev->features |= NETIF_F_VLAN_CHALLENGED;



	/* don't acquire bond device's netif_tx_lock when

	 * transmitting */

	bond_dev->features |= NETIF_F_LLTX;