linux.git/drivers/net/bonding, branch v4.5-rc2

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-01-12T04:55:43+00:00

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/ethernet/mellanox/mlxsw/spectrum.h
	drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

The bond_main.c and mellanox switch conflicts were cases of
overlapping changes.

Signed-off-by: David S. Miller

bonding: Prevent IPv6 link local address on enslaved devices

2016-01-11T22:55:41+00:00

Commit 1f718f0f4f97 ("bonding: populate neighbour's private on enslave")
undoes the fix provided by commit c2edacf80e15 ("bonding / ipv6: no addrconf
for slaves separately from master") by effectively setting the slave flag
after the slave has been opened.  If the slave comes up quickly enough, it
will go through the IPv6 addrconf before the slave flag has been set and
will get a link local IPv6 address.

In order to ensure that addrconf knows to ignore the slave devices on state
change, set IFF_SLAVE before dev_open() during bonding enslavement.

Fixes: 1f718f0f4f97 ("bonding: populate neighbour's private on enslave")
Signed-off-by: Karl Heiss 
Signed-off-by: Jay Vosburgh 
Reviewed-by: Jarod Wilson 
Signed-off-by: Andy Gospodarek 
Signed-off-by: David S. Miller

bonding: make mii_status sysfs node consistent

2016-01-11T22:14:42+00:00

The spew in /proc/net/bonding/bond0 uses netif_carrier_ok() to determine
mii_status, while /sys/class/net/bond0/bonding/mii_status looks at
curr_active_slave, which doesn't actually seem to be set sometimes when
the bond actually is up. A mode 4 bond configured via ifcfg-foo files on a
Red Hat Enterprise Linux system, after boot, comes up clean and
functional, but the sysfs node shows mii_status of down, while proc shows
up. A simple enough fix here seems to be to use the same method for
determining up or down in both places, and I'd opt for the one that seems
to match reality.

CC: Jay Vosburgh 
CC: Veaceslav Falico 
CC: Andy Gospodarek 
CC: netdev@vger.kernel.org
Signed-off-by: Jarod Wilson 
Signed-off-by: David S. Miller

bonding: drop unused to_dev macro in bond_sysfs.c

2015-12-24T03:26:48+00:00

to_dev is not used anymore so drop it.

Signed-off-by: Geliang Tang 
Signed-off-by: David S. Miller

net: Rename NETIF_F_ALL_CSUM to NETIF_F_CSUM_MASK

2015-12-15T21:50:08+00:00

The name NETIF_F_ALL_CSUM is a misnomer. This does not correspond to the
set of features for offloading all checksums. This is a mask of the
checksum offload related features bits. It is incorrect to set both
NETIF_F_HW_CSUM and NETIF_F_IP_CSUM or NETIF_F_IPV6 at the same time for
features of a device.

This patch:
  - Changes instances of NETIF_F_ALL_CSUM to NETIF_F_CSUM_MASK (where
    NETIF_F_ALL_CSUM is being used as a mask).
  - Changes bonding, sfc/efx, ipvlan, macvlan, vlan, and team drivers to
    use NEITF_F_HW_CSUM in features list instead of NETIF_F_ALL_CSUM.

Signed-off-by: Tom Herbert 
Signed-off-by: David S. Miller

net: bonding: remove redudant brackets

2015-12-04T05:07:14+00:00

It is not necessary to use two brackets. As such, the redudant brackets
are removed.

CC: Jay Vosburgh 
CC: Veaceslav Falico 
CC: Andy Gospodarek 
Signed-off-by: Zhu Yanjun 
Signed-off-by: David S. Miller

bonding: set inactive flags on release

2015-12-03T16:49:27+00:00

Be correct and symmetric to enslave and set inactive flags during release.
That gives LAG offload drivers - lower state change listeners - possibility
to do proper cleanup.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

bonding: implement lower state change propagation

2015-12-03T16:49:27+00:00

Let netdev notifier listeners know about link and slave state change.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

bonding: allow notifications for bond_set_slave_link_state

2015-12-03T16:49:27+00:00

Similar to state notifications.

We allow caller to indicate if the notification should happen now or later,
depending on if he holds rtnl mutex or not. Introduce bond_slave_link_notify
function (similar to bond_slave_state_notify) which is later on called
with rtnl mutex and goes over slaves and executes delayed notification.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

bonding: fill-up LAG changeupper info struct and pass it along

2015-12-03T16:49:26+00:00

Initialize netdev_lag_upper_info structure by TX type according to
current bonding mode and pass it along via netdev_master_upper_dev_link.

Signed-off-by: Jiri Pirko 
Reviewed-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller