diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-25 00:59:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-25 00:59:22 +0100 |
| commit | 3c701651c8c5f35e846512070cdbf2f5980db62c (patch) | |
| tree | 529271b31a849062491afce37527cb41dab65746 /drivers/net/bonding/bond_3ad.h | |
| parent | usb: host: remove selects of USB_ARCH_HAS_?HCI (diff) | |
| parent | Linux 3.14-rc4 (diff) | |
| download | linux-3c701651c8c5f35e846512070cdbf2f5980db62c.tar.xz linux-3c701651c8c5f35e846512070cdbf2f5980db62c.zip | |
Merge 3.14-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 { |