Re: [patch net-next] bonding: allow to add vlans on top of empty bond
From: Veaceslav Falico <hidden>
Date: 2014-06-28 07:31:03
On Fri, Jun 27, 2014 at 04:13:12PM +0200, Jiri Pirko wrote:
This limitation maybe had some reason in the past, but now there is not one -> removing this.
Yeah, purely legacy stuff.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
For the patch: Acked-by: Veaceslav Falico <redacted> It would be also nice if you could have time to follow up with Jay's remarks :).
quoted hunk ↗ jump to hunk
--- drivers/net/bonding/bond_main.c | 13 ------------- 1 file changed, 13 deletions(-)diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 3a451b6..ffefb70 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c@@ -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; -- 1.9.0