diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-01 22:33:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-01 22:51:30 -0700 |
| commit | dda922c831d1661c11a3ae1051b7160236f6ffb0 (patch) | |
| tree | 2fe588dbc4dc90addaabf303713fb2c6af0dc19b /net/core | |
| parent | db3397b9aa30d334be237170e048dcd96e1e951d (diff) | |
| parent | c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/phy/amd-xgbe-phy.c
drivers/net/wireless/iwlwifi/Kconfig
include/net/mac80211.h
iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.
The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/ethtool.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 4f6a17ef0710..eb0c3ace7458 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -358,15 +358,7 @@ static int ethtool_get_settings(struct net_device *dev, void __user *useraddr) int err; struct ethtool_cmd cmd; - if (!dev->ethtool_ops->get_settings) - return -EOPNOTSUPP; - - if (copy_from_user(&cmd, useraddr, sizeof(cmd))) - return -EFAULT; - - cmd.cmd = ETHTOOL_GSET; - - err = dev->ethtool_ops->get_settings(dev, &cmd); + err = __ethtool_get_settings(dev, &cmd); if (err < 0) return err; |