From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 3/4] batman-adv: Remove ethtool .get_settings stub
Date: Sat, 1 Apr 2017 14:47:05 +0200 [thread overview]
Message-ID: <20170401124706.18257-4-sven@narfation.org> (raw)
In-Reply-To: <20170401124706.18257-1-sven@narfation.org>
The .get_settings function pointer and the related API was deprecated.
Fortunately, batman-adv is a virtual interface and never provided any
useful information via .get_settings. The stub can therefore be
removed.
This also avoids that incorrect information is shown in ethtool about the
batadv interface.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
net/batman-adv/soft-interface.c | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 4e888c5e..c2a00342 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -64,7 +64,6 @@
#include "sysfs.h"
#include "translation-table.h"
-static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
static void batadv_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info);
static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data);
@@ -73,7 +72,6 @@ static void batadv_get_ethtool_stats(struct net_device *dev,
static int batadv_get_sset_count(struct net_device *dev, int stringset);
static const struct ethtool_ops batadv_ethtool_ops = {
- .get_settings = batadv_get_settings,
.get_drvinfo = batadv_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_strings = batadv_get_strings,
@@ -1078,23 +1076,6 @@ struct rtnl_link_ops batadv_link_ops __read_mostly = {
.dellink = batadv_softif_destroy_netlink,
};
-/* ethtool */
-static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
- cmd->supported = 0;
- cmd->advertising = 0;
- ethtool_cmd_speed_set(cmd, SPEED_10);
- cmd->duplex = DUPLEX_FULL;
- cmd->port = PORT_TP;
- cmd->phy_address = 0;
- cmd->transceiver = XCVR_INTERNAL;
- cmd->autoneg = AUTONEG_DISABLE;
- cmd->maxtxpkt = 0;
- cmd->maxrxpkt = 0;
-
- return 0;
-}
-
static void batadv_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
--
2.11.0
next prev parent reply other threads:[~2017-04-01 12:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-01 12:47 [B.A.T.M.A.N.] [PATCH 0/4] batman-adv: ethtool code cleanup Sven Eckelmann
2017-04-01 12:47 ` [B.A.T.M.A.N.] [PATCH 1/4] batman-adv: Use ethtool helper to get link status Sven Eckelmann
2017-04-01 12:47 ` [B.A.T.M.A.N.] [PATCH 2/4] batman-adv: Remove ethtool msglevel functions Sven Eckelmann
2017-04-01 12:47 ` Sven Eckelmann [this message]
2017-04-01 12:47 ` [B.A.T.M.A.N.] [PATCH 4/4] batman-adv: Group ethtool related code together Sven Eckelmann
2017-04-01 15:35 ` [B.A.T.M.A.N.] [PATCH 0/4] batman-adv: ethtool code cleanup Marek Lindner
2017-04-03 16:12 ` Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170401124706.18257-4-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox