diff options
| author | Mahesh Bandewar | 2015-10-31 20:45:11 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-11-03 04:52:24 +0100 |
| commit | 52bc67168109ade61014a36feedf09f4bc53d8f1 (patch) | |
| tree | 48a4bb01acaecc60bd9d87c2dd4c4959e926b59e /drivers/net/bonding/bond_main.c | |
| parent | bonding: unify all places where actor-oper key needs to be updated. (diff) | |
| download | kernel-qcow2-linux-52bc67168109ade61014a36feedf09f4bc53d8f1.tar.gz kernel-qcow2-linux-52bc67168109ade61014a36feedf09f4bc53d8f1.tar.xz kernel-qcow2-linux-52bc67168109ade61014a36feedf09f4bc53d8f1.zip | |
bonding: simplify / unify event handling code for 3ad mode.
Old logic of updating state-machine is not required since
ad_update_actor_keys() does it implicitly. The only loss is
the notification differentiation between speed vs. duplex
change. Now only one unified notification is printed.
Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index d0f23cd6e236..b4351caf8e01 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2943,8 +2943,6 @@ static int bond_slave_netdev_event(unsigned long event, struct slave *slave = bond_slave_get_rtnl(slave_dev), *primary; struct bonding *bond; struct net_device *bond_dev; - u32 old_speed; - u8 old_duplex; /* A netdev event can be generated while enslaving a device * before netdev_rx_handler_register is called in which case @@ -2965,17 +2963,9 @@ static int bond_slave_netdev_event(unsigned long event, break; case NETDEV_UP: case NETDEV_CHANGE: - old_speed = slave->speed; - old_duplex = slave->duplex; - bond_update_speed_duplex(slave); - - if (BOND_MODE(bond) == BOND_MODE_8023AD) { - if (old_speed != slave->speed) - bond_3ad_adapter_speed_changed(slave); - if (old_duplex != slave->duplex) - bond_3ad_adapter_duplex_changed(slave); - } + if (BOND_MODE(bond) == BOND_MODE_8023AD) + bond_3ad_adapter_speed_duplex_changed(slave); /* Fallthrough */ case NETDEV_DOWN: /* Refresh slave-array if applicable! |