diff options
author | Nils Carlson <nils.carlson@ericsson.com> | 2011-03-03 22:09:12 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-07 16:02:18 -0800 |
commit | 9ac3524a948cab48137a8b40a4fa8ae1092b0a24 (patch) | |
tree | ab03bb4ace08ee4803b01d75e1f85d7e4de7b308 /drivers/net/bonding/bond_3ad.h | |
parent | 16d79d7dc98e56d4700054b9b785a92102d8998c (diff) | |
download | linux-3.10-9ac3524a948cab48137a8b40a4fa8ae1092b0a24.tar.gz linux-3.10-9ac3524a948cab48137a8b40a4fa8ae1092b0a24.tar.bz2 linux-3.10-9ac3524a948cab48137a8b40a4fa8ae1092b0a24.zip |
bonding 802.3ad: Rename rx_machine_lock to state_machine_lock
Rename the rx_machine_lock to state_machine_lock as this makes more
sense in light of it now protecting all the state machines against
concurrency.
Signed-off-by: Nils Carlson <nils.carlson@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_3ad.h')
-rw-r--r-- | drivers/net/bonding/bond_3ad.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h index 2c46a154f2c..b28baff7086 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h @@ -264,7 +264,8 @@ struct ad_bond_info { struct ad_slave_info { struct aggregator aggregator; // 802.3ad aggregator structure struct port port; // 802.3ad port structure - spinlock_t rx_machine_lock; // To avoid race condition between callback and receive interrupt + spinlock_t state_machine_lock; /* mutex state machines vs. + incoming LACPDU */ u16 id; }; |