diff options
| author | Brandon Philips <brandon@ifup.org> | 2008-07-15 02:18:41 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 02:22:08 -0400 |
| commit | b11f8d8cc3bb2fa6fa55286babc1a5ebb2e932c4 (patch) | |
| tree | bafbb4ca35003403da55c5a34c56e2390d1af8b2 /include | |
| parent | 4f63135eb23015a17eaf4f7478deedf63e98ff5c (diff) | |
| download | linux-3.10-b11f8d8cc3bb2fa6fa55286babc1a5ebb2e932c4.tar.gz linux-3.10-b11f8d8cc3bb2fa6fa55286babc1a5ebb2e932c4.tar.bz2 linux-3.10-b11f8d8cc3bb2fa6fa55286babc1a5ebb2e932c4.zip | |
ethtool: Expand ethtool_cmd.speed to 32 bits
Introduce the speed_hi field to ethtool_cmd, using the reserved space,
to expand the speed field to 2^32 Megabits/second.
Making this field expansion now gives us plenty of time to fix up the
user-space pieces that use SIOCETHTOOL before hardware faster than 64
Gb/s is available.
Signed-off-by: Brandon Philips <bphilips@suse.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ethtool.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 8bb5e87df36..b4b038b89ee 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -27,9 +27,24 @@ struct ethtool_cmd { __u8 autoneg; /* Enable or disable autonegotiation */ __u32 maxtxpkt; /* Tx pkts before generating tx int */ __u32 maxrxpkt; /* Rx pkts before generating rx int */ - __u32 reserved[4]; + __u16 speed_hi; + __u16 reserved2; + __u32 reserved[3]; }; +static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep, + __u32 speed) +{ + + ep->speed = (__u16)speed; + ep->speed_hi = (__u16)(speed >> 16); +} + +static inline __u32 ethtool_cmd_speed(struct ethtool_cmd *ep) +{ + return (ep->speed_hi << 16) | ep->speed; +} + #define ETHTOOL_BUSINFO_LEN 32 /* these strings are set to whatever the driver author decides... */ struct ethtool_drvinfo { |