diff options
Diffstat (limited to 'drivers/net/bonding/bond_alb.h')
| -rw-r--r-- | drivers/net/bonding/bond_alb.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_alb.h b/drivers/net/bonding/bond_alb.h index 4b3e3587840..8ca7158b2dd 100644 --- a/drivers/net/bonding/bond_alb.h +++ b/drivers/net/bonding/bond_alb.h | |||
| @@ -75,8 +75,8 @@ struct tlb_client_info { | |||
| 75 | * gave this entry index. | 75 | * gave this entry index. |
| 76 | */ | 76 | */ |
| 77 | u32 tx_bytes; /* Each Client accumulates the BytesTx that | 77 | u32 tx_bytes; /* Each Client accumulates the BytesTx that |
| 78 | * were tranmitted to it, and after each | 78 | * were transmitted to it, and after each |
| 79 | * CallBack the LoadHistory is devided | 79 | * CallBack the LoadHistory is divided |
| 80 | * by the balance interval | 80 | * by the balance interval |
| 81 | */ | 81 | */ |
| 82 | u32 load_history; /* This field contains the amount of Bytes | 82 | u32 load_history; /* This field contains the amount of Bytes |
| @@ -122,7 +122,6 @@ struct tlb_slave_info { | |||
| 122 | }; | 122 | }; |
| 123 | 123 | ||
| 124 | struct alb_bond_info { | 124 | struct alb_bond_info { |
| 125 | struct timer_list alb_timer; | ||
| 126 | struct tlb_client_info *tx_hashtbl; /* Dynamically allocated */ | 125 | struct tlb_client_info *tx_hashtbl; /* Dynamically allocated */ |
| 127 | spinlock_t tx_hashtbl_lock; | 126 | spinlock_t tx_hashtbl_lock; |
| 128 | u32 unbalanced_load; | 127 | u32 unbalanced_load; |
| @@ -140,7 +139,6 @@ struct alb_bond_info { | |||
| 140 | struct slave *next_rx_slave;/* next slave to be assigned | 139 | struct slave *next_rx_slave;/* next slave to be assigned |
| 141 | * to a new rx client for | 140 | * to a new rx client for |
| 142 | */ | 141 | */ |
| 143 | u32 rlb_interval_counter; | ||
| 144 | u8 primary_is_promisc; /* boolean */ | 142 | u8 primary_is_promisc; /* boolean */ |
| 145 | u32 rlb_promisc_timeout_counter;/* counts primary | 143 | u32 rlb_promisc_timeout_counter;/* counts primary |
| 146 | * promiscuity time | 144 | * promiscuity time |