summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_3ad.h
diff options
context:
space:
mode:
authorJay Vosburgh <fubar@us.ibm.com>2006-03-27 23:27:43 +0200
committerJeff Garzik <jeff@garzik.org>2006-03-30 00:34:02 +0200
commitff59c4563a8d1b39597aab4917959146c61f09b0 (patch)
tree5be8ad689d944f27a7b4b4bed2942c3ef47d7a98 /drivers/net/bonding/bond_3ad.h
parentMerge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv... (diff)
downloadlinux-ff59c4563a8d1b39597aab4917959146c61f09b0.tar.xz
linux-ff59c4563a8d1b39597aab4917959146c61f09b0.zip
[PATCH] bonding: support carrier state for master
Add support for the bonding master to specify its carrier state based upon the state of the slaves. For 802.3ad, the bond is up if there is an active, parterned aggregator. For other modes, the bond is up if any slaves are up. Updates driver version to 3.0.3. Based on a patch by jamal <hadi@cyberus.ca>. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/bonding/bond_3ad.h')
-rw-r--r--drivers/net/bonding/bond_3ad.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 5ee2cef5b037..6ad5ad6e65d5 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -283,5 +283,6 @@ 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_xmit_xor(struct sk_buff *skb, struct net_device *dev);
int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev);
+int bond_3ad_set_carrier(struct bonding *bond);
#endif //__BOND_3AD_H__