diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:16 -0400 |
| commit | 875999c5539999f61a45620aae0c3e5fb1d2b035 (patch) | |
| tree | 4535032a8a10f5782c0aef6a620b1a624ea9f863 /drivers/net/bonding/bond_3ad.h | |
| parent | 79072f38909e3d9883317238887460c39ddcc4cb (diff) | |
| parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/net/bonding/bond_3ad.h')
| -rw-r--r-- | drivers/net/bonding/bond_3ad.h | 1 |
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); | |||
| 283 | int bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info); | 283 | int bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info); |
| 284 | int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev); | 284 | int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev); |
| 285 | int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev); | 285 | int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev); |
| 286 | int bond_3ad_set_carrier(struct bonding *bond); | ||
| 286 | #endif //__BOND_3AD_H__ | 287 | #endif //__BOND_3AD_H__ |
| 287 | 288 | ||