diff options
| author |   David Decotigny <decot@google.com> | 2011-04-27 18:32:38 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-04-29 14:01:30 -0700 |
| commit | 8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2 (patch) | |
| tree | 0c85476c2af6568c3d3a73a960d582d2f91a1256 /drivers/net/e100.c | |
| parent | ethtool: cosmetics: enforce const-ness in ethtool_cmd_speed (diff) | |
| download | linux-dev-8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2.tar.xz linux-dev-8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2.zip | |
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/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index b0aa9e68990a..66ba596a4d37 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -1668,7 +1668,7 @@ static void e100_adjust_adaptive_ifs(struct nic *nic, int speed, int duplex) static void e100_watchdog(unsigned long data) { struct nic *nic = (struct nic *)data; - struct ethtool_cmd cmd; + struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET }; netif_printk(nic, timer, KERN_DEBUG, nic->netdev, "right now = %ld\n", jiffies); |