diff options
| author | Jiri Bohac | 2014-02-14 18:13:50 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-02-17 20:54:06 +0100 |
| commit | 163c8ff30dbe473abfbb24a7eac5536c87f3baa9 (patch) | |
| tree | 6cbde63c7e067a5b062693183657faf66d2fe3c8 /drivers/net/bonding/bond_3ad.h | |
| parent | usbnet: remove generic hard_header_len check (diff) | |
| download | kernel-qcow2-linux-163c8ff30dbe473abfbb24a7eac5536c87f3baa9.tar.gz kernel-qcow2-linux-163c8ff30dbe473abfbb24a7eac5536c87f3baa9.tar.xz kernel-qcow2-linux-163c8ff30dbe473abfbb24a7eac5536c87f3baa9.zip | |
bonding: 802.3ad: make aggregator_identifier bond-private
aggregator_identifier is used to assign unique aggregator identifiers
to aggregators of a bond during device enslaving.
aggregator_identifier is currently a global variable that is zeroed in
bond_3ad_initialize().
This sequence will lead to duplicate aggregator identifiers for eth1 and eth3:
create bond0
change bond0 mode to 802.3ad
enslave eth0 to bond0 //eth0 gets agg id 1
enslave eth1 to bond0 //eth1 gets agg id 2
create bond1
change bond1 mode to 802.3ad
enslave eth2 to bond1 //aggregator_identifier is reset to 0
//eth2 gets agg id 1
enslave eth3 to bond0 //eth3 gets agg id 2
Fix this by making aggregator_identifier private to the bond.
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Acked-by: Veaceslav Falico <vfalico@redhat.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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h index 13dc9d3c5e34..f4dd9592ac62 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h @@ -253,6 +253,7 @@ struct ad_system { struct ad_bond_info { struct ad_system system; /* 802.3ad system structure */ u32 agg_select_timer; // Timer to select aggregator after all adapter's hand shakes + u16 aggregator_identifier; }; struct ad_slave_info { |