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 2/4] batman-adv: Remove ethtool msglevel functions
Date: Sat, 1 Apr 2017 14:47:04 +0200 [thread overview]
Message-ID: <20170401124706.18257-3-sven@narfation.org> (raw)
In-Reply-To: <20170401124706.18257-1-sven@narfation.org>
batadv devices don't support msglevel. The ethtool stubs therefore returned
that it isn't supported. But instead, the complete function can be dropped
to avoid that bogus values are shown in ethtool.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
net/batman-adv/soft-interface.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 583fcfca..4e888c5e 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -67,8 +67,6 @@
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 u32 batadv_get_msglevel(struct net_device *dev);
-static void batadv_set_msglevel(struct net_device *dev, u32 value);
static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data);
static void batadv_get_ethtool_stats(struct net_device *dev,
struct ethtool_stats *stats, u64 *data);
@@ -77,8 +75,6 @@ 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_msglevel = batadv_get_msglevel,
- .set_msglevel = batadv_set_msglevel,
.get_link = ethtool_op_get_link,
.get_strings = batadv_get_strings,
.get_ethtool_stats = batadv_get_ethtool_stats,
@@ -1108,15 +1104,6 @@ static void batadv_get_drvinfo(struct net_device *dev,
strlcpy(info->bus_info, "batman", sizeof(info->bus_info));
}
-static u32 batadv_get_msglevel(struct net_device *dev)
-{
- return -EOPNOTSUPP;
-}
-
-static void batadv_set_msglevel(struct net_device *dev, u32 value)
-{
-}
-
/* Inspired by drivers/net/ethernet/dlink/sundance.c:1702
* Declare each description string in struct.name[] to get fixed sized buffer
* and compile time checking for strings longer than ETH_GSTRING_LEN.
--
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 ` Sven Eckelmann [this message]
2017-04-01 12:47 ` [B.A.T.M.A.N.] [PATCH 3/4] batman-adv: Remove ethtool .get_settings stub Sven Eckelmann
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-3-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