Merge tag 'xtensa-20151108' of git://github.com/czankel/xtensa-linux

[linux-2.6-block.git] / include / net / bond_3ad.h

diff --git a/include/net/bond_3ad.h b/include/net/bond_3ad.h
index c2a40a172fcdde4f97dd4d66d6102f9a561eefb4..f1fbc3b119623de61becd9c45e44c05211b97ec3 100644 (file)
--- 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,