diff options
| author | Brandon Philips <brandon@ifup.org> | 2008-09-12 02:31:40 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-13 18:49:13 -0400 |
| commit | e3ac850412df91b64aa5f7ccb5e043948a8caef4 (patch) | |
| tree | 9df9d242b4ef4fdfce80c2018735c6895334725a /ethtool.c | |
| parent | 9f77b6be72c7a77b619564e7d9327da230d1c9e4 (diff) | |
| download | ethtool-e3ac850412df91b64aa5f7ccb5e043948a8caef4.tar.gz | |
ethtool: Use ethtool_cmd->speed_hi
struct ethtool_cmd now has a speed_hi field to support more than 65535
Mb devices, use it.
Also, pull in the ethtool-copy.h file without the __KERNEL__ sections.
Signed-off-by: Brandon Philips <bphilips@suse.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'ethtool.c')
| -rw-r--r-- | ethtool.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -805,7 +805,7 @@ static int dump_ecmd(struct ethtool_cmd *ep) dump_advertised(ep); fprintf(stdout, " Speed: "); - switch (ep->speed) { + switch (ethtool_cmd_speed(ep)) { case SPEED_10: fprintf(stdout, "10Mb/s\n"); break; @@ -822,7 +822,7 @@ static int dump_ecmd(struct ethtool_cmd *ep) fprintf(stdout, "10000Mb/s\n"); break; default: - fprintf(stdout, "Unknown! (%i)\n", ep->speed); + fprintf(stdout, "Unknown! (%i)\n", ethtool_cmd_speed(ep)); break; }; @@ -1726,7 +1726,7 @@ static int do_sset(int fd, struct ifreq *ifr) } else { /* Change everything the user specified. */ if (speed_wanted != -1) - ecmd.speed = speed_wanted; + ethtool_cmd_speed_set(&ecmd, speed_wanted); if (duplex_wanted != -1) ecmd.duplex = duplex_wanted; if (port_wanted != -1) |