From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 15/19] batman-adv: Use ethtool helper to get link status
Date: Thu, 6 Apr 2017 16:07:37 +0200 [thread overview]
Message-ID: <20170406140741.30745-16-sw@simonwunderlich.de> (raw)
In-Reply-To: <20170406140741.30745-1-sw@simonwunderlich.de>
From: Sven Eckelmann <sven@narfation.org>
The ethtool_ops of batman-adv never contained more than a stub for the
get_link function pointer. It was always returning that a link exists even
when the devices was not yet up and therefore nothing resampling a link
could have been available.
Instead use the ethtool helper which returns the current carrier state.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Acked-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/soft-interface.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index a9dbcc1590bd..eff23d519c6f 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -69,7 +69,6 @@ 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 u32 batadv_get_link(struct net_device *dev);
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);
@@ -80,7 +79,7 @@ static const struct ethtool_ops batadv_ethtool_ops = {
.get_drvinfo = batadv_get_drvinfo,
.get_msglevel = batadv_get_msglevel,
.set_msglevel = batadv_set_msglevel,
- .get_link = batadv_get_link,
+ .get_link = ethtool_op_get_link,
.get_strings = batadv_get_strings,
.get_ethtool_stats = batadv_get_ethtool_stats,
.get_sset_count = batadv_get_sset_count,
@@ -1119,11 +1118,6 @@ static void batadv_set_msglevel(struct net_device *dev, u32 value)
{
}
-static u32 batadv_get_link(struct net_device *dev)
-{
- return 1;
-}
-
/* 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-06 14:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-06 14:07 [B.A.T.M.A.N.] [PATCH 00/19] pull request for net-next: batman-adv 2017-04-06 Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 01/19] batman-adv: Start new development cycle Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 02/19] batman-adv: Reduce preprocessor checks in multicast.c Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 03/19] batman-adv: Fix unbalanced braces around else statement Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 04/19] batman-adv: Fix possible side-effects in _batadv_dbg Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 05/19] batman-adv: Convert BATADV_PRINT_VID macro to function Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 06/19] batman-adv: Use __func__ to add function names to messages Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 07/19] batman-adv: Omit unnecessary memset of netdev private data Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 08/19] batman-adv: prevent multiple ARP replies sent by gateways if dat enabled Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 09/19] batman-adv: prevent duplication of ARP replies when DAT is used Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 10/19] batman-adv: drop unicast packets from other backbone gw Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 11/19] batman-adv: changed debug messages for easier bla debugging Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 12/19] batman-adv: handle race condition for claims between gateways Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 13/19] batman-adv: privatize forw_packet skb assignment Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 14/19] batman-adv: restructure rebroadcast counter into forw_packet API Simon Wunderlich
2017-04-06 14:07 ` Simon Wunderlich [this message]
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 16/19] batman-adv: Remove ethtool msglevel functions Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 17/19] batman-adv: Remove ethtool .get_settings stub Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 18/19] batman-adv: Group ethtool related code together Simon Wunderlich
2017-04-06 14:07 ` [B.A.T.M.A.N.] [PATCH 19/19] batman-adv: Use net_device_stats from struct net_device Simon Wunderlich
2017-04-06 21:55 ` [B.A.T.M.A.N.] [PATCH 00/19] pull request for net-next: batman-adv 2017-04-06 David Miller
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=20170406140741.30745-16-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.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