diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-03 22:22:45 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-03 22:22:45 -0500 |
| commit | 46153552b43675dd4057cd526331b5bd10f39c7d (patch) | |
| tree | 62b6055ee61e320dc10ea81903abbe2e7553bf4e /drivers/net/bonding | |
| parent | f90fdc3cce3d8c8ed09615dc68cb789655078803 (diff) | |
| parent | f71e130966ba429dbd24be08ddbcdf263df9a5ad (diff) | |
Merge branch 'net-const'
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_alb.c | 2 | ||||
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index f2a63186ae05..e83bc825f6af 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
| @@ -1261,7 +1261,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) | |||
| 1261 | struct ethhdr *eth_data; | 1261 | struct ethhdr *eth_data; |
| 1262 | struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); | 1262 | struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); |
| 1263 | struct slave *tx_slave = NULL; | 1263 | struct slave *tx_slave = NULL; |
| 1264 | static u32 ip_bcast = 0xffffffff; | 1264 | static const u32 ip_bcast = 0xffffffff; |
| 1265 | int hash_size = 0; | 1265 | int hash_size = 0; |
| 1266 | int do_tx_balance = 1; | 1266 | int do_tx_balance = 1; |
| 1267 | u32 hash_index = 0; | 1267 | u32 hash_index = 0; |
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 623c87a83615..2d0ac169a86c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -131,7 +131,7 @@ MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form"); | |||
| 131 | 131 | ||
| 132 | /*----------------------------- Global variables ----------------------------*/ | 132 | /*----------------------------- Global variables ----------------------------*/ |
| 133 | 133 | ||
| 134 | static const char *version = | 134 | static const char * const version = |
| 135 | DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"; | 135 | DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"; |
| 136 | 136 | ||
| 137 | LIST_HEAD(bond_dev_list); | 137 | LIST_HEAD(bond_dev_list); |