Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1287721

[PATCH net-next v4 17/19] net: ethtool: remove unused __ethtool_get_settings

From David Decotigny <ddecotig@gmail.com>
Newsgroups linux.kernel
Subject [PATCH net-next v4 17/19] net: ethtool: remove unused __ethtool_get_settings
Date 2015-12-09 19:20 +0100
Message-ID <qDRvm-3qY-37@gated-at.bofh.it> (permalink)
References <qDRlD-3nA-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

From: David Decotigny <decot@googlers.com>

replaced by __ethtool_get_ksettings.

Signed-off-by: David Decotigny <decot@googlers.com>
---
 include/linux/ethtool.h |  4 ----
 net/core/ethtool.c      | 45 ++++++++++++++-------------------------------
 2 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 6077cbb..05d4f0e 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -148,10 +148,6 @@ struct ethtool_ksettings {
 extern int __ethtool_get_ksettings(struct net_device *dev,
 				   struct ethtool_ksettings *ksettings);
 
-/* DEPRECATED, use __ethtool_get_ksettings */
-extern int __ethtool_get_settings(struct net_device *dev,
-				  struct ethtool_cmd *cmd);
-
 /**
  * struct ethtool_ops - optional netdev operations
  * @get_settings: DEPRECATED, use %get_ksettings/%set_ksettings
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 4865031..84dca87 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -495,7 +495,12 @@ int __ethtool_get_ksettings(struct net_device *dev,
 	 * legacy %ethtool_cmd API, unless it's not supported either.
 	 * TODO: remove when ethtool_ops::get_settings disappears internally
 	 */
-	err = __ethtool_get_settings(dev, &cmd);
+	if (!dev->ethtool_ops->get_settings)
+		return -EOPNOTSUPP;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.cmd = ETHTOOL_GSET;
+	err = dev->ethtool_ops->get_settings(dev, &cmd);
 	if (err < 0)
 		return err;
 
@@ -652,30 +657,6 @@ static int ethtool_set_ksettings(struct net_device *dev, void __user *useraddr)
 	return dev->ethtool_ops->set_ksettings(dev, &ksettings);
 }
 
-/* Internal kernel helper to query a device ethtool_cmd settings.
- *
- * Note about transition to ethtool_settings API: We do not need (or
- * want) this function to support "dev" instances that implement the
- * ethtool_settings API as we will update the drivers calling this
- * function to call __ethtool_get_ksettings instead, before the first
- * drivers implement ethtool_ops::get_ksettings.
- *
- * TODO 1: at least make this function static when no driver is using it
- * TODO 2: remove when ethtool_ops::get_settings disappears internally
- */
-int __ethtool_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-	ASSERT_RTNL();
-
-	if (!dev->ethtool_ops->get_settings)
-		return -EOPNOTSUPP;
-
-	memset(cmd, 0, sizeof(struct ethtool_cmd));
-	cmd->cmd = ETHTOOL_GSET;
-	return dev->ethtool_ops->get_settings(dev, cmd);
-}
-EXPORT_SYMBOL(__ethtool_get_settings);
-
 static void
 warn_incomplete_ethtool_legacy_settings_conversion(const char *details)
 {
@@ -717,16 +698,18 @@ static int ethtool_get_settings(struct net_device *dev, void __user *useraddr)
 		/* send a sensible cmd tag back to user */
 		cmd.cmd = ETHTOOL_GSET;
 	} else {
-		int err;
-		/* TODO: return -EOPNOTSUPP when
-		 * ethtool_ops::get_settings disappears internally
-		 */
-
 		/* driver doesn't support %ethtool_ksettings
 		 * API. revert to legacy %ethtool_cmd API, unless it's
 		 * not supported either.
 		 */
-		err = __ethtool_get_settings(dev, &cmd);
+		int err;
+
+		if (!dev->ethtool_ops->get_settings)
+			return -EOPNOTSUPP;
+
+		memset(&cmd, 0, sizeof(cmd));
+		cmd.cmd = ETHTOOL_GSET;
+		err = dev->ethtool_ops->get_settings(dev, &cmd);
 		if (err < 0)
 			return err;
 	}
-- 
2.6.0.rc2.230.g3dd15c0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next v4 00/19] RFC: new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:10 +0100
  [PATCH net-next v4 18/19] net: mlx4: convenience predicate for debug messages David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:10 +0100
  [PATCH net-next v4 02/19] test_bitmap: unit tests for lib/bitmap.c David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:10 +0100
  [PATCH net-next v4 09/19] net: ipvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 08/19] net: bonding: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 13/19] net: rdma: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 06/19] tx4939: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 07/19] net: usnic: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 03/19] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 12/19] net: fcoe: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
    Re: [PATCH net-next v4 12/19] net: fcoe: use __ethtool_get_ksettings kbuild test robot <lkp@intel.com> - 2015-12-09 20:20 +0100
      Re: [PATCH net-next v4 12/19] net: fcoe: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-10 05:10 +0100
  [PATCH net-next v4 01/19] lib/bitmap.c: conversion routines to/from u32 array David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 10/19] net: macvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 04/19] net: usnic: use __ethtool_get_settings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 17/19] net: ethtool: remove unused __ethtool_get_settings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 16/19] net: core: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 19/19] net: mlx4: use new ETHTOOL_G/SSETTINGS API David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 11/19] net: team: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100

csiph-web