Commit a9b3ace4 authored May 20, 2014 by Michal Kubeček Committed by David S. Miller May 22, 2014

bonding: fix vlan_features computing



bond_compute_features() uses netdev_increment_features() to
combine vlan_features of slaves into vlan_features of the bond.
As netdev_increment_features() only adds most features and we
start with BOND_VLAN_FEATURES, we can end up with features none
of the slaves provided.

If there is at least one slave, initialize vlan_features only
with the flags in NETIF_F_ALL_FOR_ALL. Right now there is none
in BOND_VLAN_FEATURES but stating it explicitely will make the
code more future proof.

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent da08143b

drivers/net/bonding/bond_main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1038,6 +1038,7 @@ static void bond_compute_features(struct bonding *bond)

		if (!bond_has_slaves(bond))
		goto done;
		vlan_features &= NETIF_F_ALL_FOR_ALL;

		bond_for_each_slave(bond, slave, iter) {
		vlan_features = netdev_increment_features(vlan_features,