diff options
author | David Decotigny <decot@google.com> | 2011-04-27 14:32:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-29 17:01:30 -0400 |
commit | 8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2 (patch) | |
tree | 0c85476c2af6568c3d3a73a960d582d2f91a1256 /drivers/net/usb/dm9601.c | |
parent | 36504605432996590f889e33d47e2d9c581f7569 (diff) |
ethtool: Call ethtool's get/set_settings callbacks with cleaned data
This makes sure that when a driver calls the ethtool's
get/set_settings() callback of another driver, the data passed to it
is clean. This guarantees that speed_hi will be zeroed correctly if
the called callback doesn't explicitely set it: we are sure we don't
get a corrupted speed from the underlying driver. We also take care of
setting the cmd field appropriately (ETHTOOL_GSET/SSET).
This applies to dev_ethtool_get_settings(), which now makes sure it
sets up that ethtool command parameter correctly before passing it to
drivers. This also means that whoever calls dev_ethtool_get_settings()
does not have to clean the ethtool command parameter. This function
also becomes an exported symbol instead of an inline.
All drivers visible to make allyesconfig under x86_64 have been
updated.
Signed-off-by: David Decotigny <decot@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/dm9601.c')
-rw-r--r-- | drivers/net/usb/dm9601.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 5002f5be47be..1d93133e9b74 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c | |||
@@ -599,13 +599,13 @@ static void dm9601_status(struct usbnet *dev, struct urb *urb) | |||
599 | 599 | ||
600 | static int dm9601_link_reset(struct usbnet *dev) | 600 | static int dm9601_link_reset(struct usbnet *dev) |
601 | { | 601 | { |
602 | struct ethtool_cmd ecmd; | 602 | struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET }; |
603 | 603 | ||
604 | mii_check_media(&dev->mii, 1, 1); | 604 | mii_check_media(&dev->mii, 1, 1); |
605 | mii_ethtool_gset(&dev->mii, &ecmd); | 605 | mii_ethtool_gset(&dev->mii, &ecmd); |
606 | 606 | ||
607 | netdev_dbg(dev->net, "link_reset() speed: %d duplex: %d\n", | 607 | netdev_dbg(dev->net, "link_reset() speed: %u duplex: %d\n", |
608 | ecmd.speed, ecmd.duplex); | 608 | ethtool_cmd_speed(&ecmd), ecmd.duplex); |
609 | 609 | ||
610 | return 0; | 610 | return 0; |
611 | } | 611 | } |