Commit b04af6ee authored by Shmulik Hen's avatar Shmulik Hen Committed by Jeff Garzik

[PATCH] bonding cleanup 2.6 - Consolidate function declarations

All functions begin with bond_
Return value, function name and all params are on the same line.
parent 3d91647a
This diff is collapsed.
...@@ -126,7 +126,7 @@ void bond_alb_deinitialize(struct bonding *bond); ...@@ -126,7 +126,7 @@ void bond_alb_deinitialize(struct bonding *bond);
int bond_alb_init_slave(struct bonding *bond, struct slave *slave); int bond_alb_init_slave(struct bonding *bond, struct slave *slave);
void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave); void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave);
void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char link); void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char link);
void bond_alb_assign_current_slave(struct bonding *bond, struct slave *new_slave); void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave);
int bond_alb_xmit(struct sk_buff *skb, struct net_device *dev); int bond_alb_xmit(struct sk_buff *skb, struct net_device *dev);
void bond_alb_monitor(struct bonding *bond); void bond_alb_monitor(struct bonding *bond);
int bond_alb_set_mac_address(struct net_device *dev, void *addr); int bond_alb_set_mac_address(struct net_device *dev, void *addr);
......
This diff is collapsed.
...@@ -121,8 +121,8 @@ struct bonding { ...@@ -121,8 +121,8 @@ struct bonding {
* Caller must hold bond->lock * Caller must hold bond->lock
*/ */
#define bond_for_each_slave_from(bond, pos, cnt, start) \ #define bond_for_each_slave_from(bond, pos, cnt, start) \
for (cnt = 0, pos = start; \ for (cnt = 0, pos = start; \
cnt < (bond)->slave_cnt; \ cnt < (bond)->slave_cnt; \
cnt++, pos = (pos)->next) cnt++, pos = (pos)->next)
/** /**
...@@ -156,8 +156,7 @@ struct bonding { ...@@ -156,8 +156,7 @@ struct bonding {
* *
* Caller must hold bond lock for read * Caller must hold bond lock for read
*/ */
extern inline struct slave * extern inline struct slave *bond_get_slave_by_dev(struct bonding *bond, struct net_device *slave_dev)
bond_get_slave_by_dev(struct bonding *bond, struct net_device *slave_dev)
{ {
struct slave *slave = NULL; struct slave *slave = NULL;
int i; int i;
...@@ -171,8 +170,7 @@ bond_get_slave_by_dev(struct bonding *bond, struct net_device *slave_dev) ...@@ -171,8 +170,7 @@ bond_get_slave_by_dev(struct bonding *bond, struct net_device *slave_dev)
return slave; return slave;
} }
extern inline struct bonding * extern inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
bond_get_bond_by_slave(struct slave *slave)
{ {
if (!slave || !slave->dev->master) { if (!slave || !slave->dev->master) {
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment