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/mii.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/mii.c')
-rw-r--r-- | drivers/net/mii.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/mii.c b/drivers/net/mii.c index 0a6c6a2e7550..05acca78f63a 100644 --- a/drivers/net/mii.c +++ b/drivers/net/mii.c | |||
@@ -58,6 +58,9 @@ static u32 mii_get_an(struct mii_if_info *mii, u16 addr) | |||
58 | * @mii: MII interface | 58 | * @mii: MII interface |
59 | * @ecmd: requested ethtool_cmd | 59 | * @ecmd: requested ethtool_cmd |
60 | * | 60 | * |
61 | * The @ecmd parameter is expected to have been cleared before calling | ||
62 | * mii_ethtool_gset(). | ||
63 | * | ||
61 | * Returns 0 for success, negative on error. | 64 | * Returns 0 for success, negative on error. |
62 | */ | 65 | */ |
63 | int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd) | 66 | int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd) |