diff options
| author | David Decotigny | 2011-04-13 17:22:31 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-04-15 07:00:32 +0200 |
| commit | 5d30530efbb811f875786d788ae1c5d79547c3a4 (patch) | |
| tree | ba6c1b23aaf1eb5489ef5e95cc5a45da70bf1321 /drivers/net/bonding/bonding.h | |
| parent | net-bonding: Fix minor/cosmetic type inconsistencies (diff) | |
| download | kernel-qcow2-linux-5d30530efbb811f875786d788ae1c5d79547c3a4.tar.gz kernel-qcow2-linux-5d30530efbb811f875786d788ae1c5d79547c3a4.tar.xz kernel-qcow2-linux-5d30530efbb811f875786d788ae1c5d79547c3a4.zip | |
net-bonding: Adding support for throughputs larger than 65536 Mbps
This updates the bonding driver to support v2.6.27-rc3 enhancements
(b11f8d8c aka. "ethtool: Expand ethtool_cmd.speed to 32 bits") which
allow to encode the Mbps link speed on 32-bits (Max 4 Pbps) instead of
16 (Max 65536 Mbps).
This patch also attempts to compact struct slave by reordering its
fields.
Signed-off-by: David Decotigny <decot@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bonding.h')
| -rw-r--r-- | drivers/net/bonding/bonding.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 3ca503e50718..553c764f7407 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -196,12 +196,12 @@ struct slave { u8 backup:1, /* indicates backup slave. Value corresponds with BOND_STATE_ACTIVE and BOND_STATE_BACKUP */ inactive:1; /* indicates inactive slave */ + u8 duplex; u32 original_mtu; u32 link_failure_count; - u8 perm_hwaddr[ETH_ALEN]; - u16 speed; - u8 duplex; + u32 speed; u16 queue_id; + u8 perm_hwaddr[ETH_ALEN]; struct ad_slave_info ad_info; /* HUGE - better to dynamically alloc */ struct tlb_slave_info tlb_info; #ifdef CONFIG_NET_POLL_CONTROLLER |