summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorMahesh Bandewar <maheshb@google.com>2015-10-31 12:45:11 -0700
committerDavid S. Miller <davem@davemloft.net>2015-11-02 22:52:24 -0500
commit52bc67168109ade61014a36feedf09f4bc53d8f1 (patch)
tree48a4bb01acaecc60bd9d87c2dd4c4959e926b59e /include/net
parent7bb11dc9f59ddcb33ee317da77b235235aaa582a (diff)
downloadlinux-stable-52bc67168109ade61014a36feedf09f4bc53d8f1.tar.gz
linux-stable-52bc67168109ade61014a36feedf09f4bc53d8f1.tar.bz2
linux-stable-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 'include/net')
-rw-r--r--include/net/bond_3ad.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/bond_3ad.h b/include/net/bond_3ad.h
index c2a40a172fcd..f1fbc3b11962 100644
--- a/include/net/bond_3ad.h
+++ b/include/net/bond_3ad.h
@@ -297,8 +297,7 @@ void bond_3ad_bind_slave(struct slave *slave);
void bond_3ad_unbind_slave(struct slave *slave);
void bond_3ad_state_machine_handler(struct work_struct *);
void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout);
-void bond_3ad_adapter_speed_changed(struct slave *slave);
-void bond_3ad_adapter_duplex_changed(struct slave *slave);
+void bond_3ad_adapter_speed_duplex_changed(struct slave *slave);
void bond_3ad_handle_link_change(struct slave *slave, char link);
int bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info);
int __bond_3ad_get_active_agg_info(struct bonding *bond,