projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
[powerpc.git]
/
drivers
/
net
/
bonding
/
bond_alb.c
diff --git
a/drivers/net/bonding/bond_alb.c
b/drivers/net/bonding/bond_alb.c
index
854ddfb
..
e83bc82
100644
(file)
--- a/
drivers/net/bonding/bond_alb.c
+++ b/
drivers/net/bonding/bond_alb.c
@@
-169,9
+169,9
@@
static void tlb_clear_slave(struct bonding *bond, struct slave *slave, int save_
index = next_index;
}
index = next_index;
}
- _unlock_tx_hashtbl(bond);
-
tlb_init_slave(slave);
tlb_init_slave(slave);
+
+ _unlock_tx_hashtbl(bond);
}
/* Must be called before starting the monitor timer */
}
/* Must be called before starting the monitor timer */
@@
-1261,7
+1261,7
@@
int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
struct ethhdr *eth_data;
struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
struct slave *tx_slave = NULL;
struct ethhdr *eth_data;
struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
struct slave *tx_slave = NULL;
- static u32 ip_bcast = 0xffffffff;
+ static
const
u32 ip_bcast = 0xffffffff;
int hash_size = 0;
int do_tx_balance = 1;
u32 hash_index = 0;
int hash_size = 0;
int do_tx_balance = 1;
u32 hash_index = 0;