summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2011-04-14 23:46:06 -0700
committerDavid S. Miller <davem@davemloft.net>2011-05-08 12:49:33 -0700
commit1ab7b6ac2709d0eb05a7144cd0e14faa3a7ea162 (patch)
treef3ac5ea7a7e2d9f1c1fa3be7284329ec42d96191 /net
parent534eacb5d4e7bafbdb60386678afeffb7966c375 (diff)
ethtool: remove phys_id from ethtool_ops
After that all the upstream kernel drivers now use phys_id, and the old ethtool_ops interface (phys_id) can be removed. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/ethtool.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index d8b1a8d85a9..927819d9224 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1655,7 +1655,7 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)
static bool busy;
int rc;
- if (!dev->ethtool_ops->set_phys_id && !dev->ethtool_ops->phys_id)
+ if (!dev->ethtool_ops->set_phys_id)
return -EOPNOTSUPP;
if (busy)
@@ -1664,10 +1664,6 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)
if (copy_from_user(&id, useraddr, sizeof(id)))
return -EFAULT;
- if (!dev->ethtool_ops->set_phys_id)
- /* Do it the old way */
- return dev->ethtool_ops->phys_id(dev, id.data);
-
rc = dev->ethtool_ops->set_phys_id(dev, ETHTOOL_ID_ACTIVE);
if (rc < 0)
return rc;