[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110408170830.3ab079e8@nehalam>
Date: Fri, 8 Apr 2011 17:08:30 -0700
From: Stephen Hemminger <shemminger@...tta.com>
To: Ben Hutchings <bhutchings@...arflare.com>,
David Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org
Subject: [RFC] ethtool: remove phys_id from ethtool_ops
Hold this patch until after the Intel and Qlogic driver
changes are merged into net-next. Patches have been submitted
but still waiting for vendor.
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@...tta.com>
--- a/include/linux/ethtool.h 2011-04-08 16:59:55.691452941 -0700
+++ b/include/linux/ethtool.h 2011-04-08 17:00:26.135748450 -0700
@@ -767,12 +767,6 @@ bool ethtool_invalid_flags(struct net_de
* the indicator accordingly. Finally, it is called with the argument
* %ETHTOOL_ID_INACTIVE and must deactivate the indicator. Returns a
* negative error code or zero.
- * @phys_id: Deprecated in favour of @set_phys_id.
- * Identify the physical device, e.g. by flashing an LED
- * attached to it until interrupted by a signal or the given time
- * (in seconds) elapses. If the given time is zero, use a default
- * time limit. Returns a negative error code or zero. Being
- * interrupted by a signal is not an error.
* @get_ethtool_stats: Return extended statistics about the device.
* This is only useful if the device maintains statistics not
* included in &struct rtnl_link_stats64.
@@ -858,7 +852,6 @@ struct ethtool_ops {
void (*self_test)(struct net_device *, struct ethtool_test *, u64 *);
void (*get_strings)(struct net_device *, u32 stringset, u8 *);
int (*set_phys_id)(struct net_device *, enum ethtool_phys_id_state);
- int (*phys_id)(struct net_device *, u32);
void (*get_ethtool_stats)(struct net_device *,
struct ethtool_stats *, u64 *);
int (*begin)(struct net_device *);
--- a/net/core/ethtool.c 2011-04-08 17:00:33.259817585 -0700
+++ b/net/core/ethtool.c 2011-04-08 17:01:01.620092913 -0700
@@ -1623,7 +1623,7 @@ static int ethtool_phys_id(struct net_de
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)
@@ -1632,10 +1632,6 @@ static int ethtool_phys_id(struct net_de
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 && rc != -EINVAL)
return rc;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists