提交 2f249e99 编写于 作者: S Sven Eckelmann 提交者: Simon Wunderlich

batman-adv: Use ethtool helper to get link status

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: NSven Eckelmann <sven@narfation.org>
Acked-by: NMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: NSimon Wunderlich <sw@simonwunderlich.de>
上级 e2d9ba43
...@@ -69,7 +69,6 @@ static void batadv_get_drvinfo(struct net_device *dev, ...@@ -69,7 +69,6 @@ static void batadv_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info); struct ethtool_drvinfo *info);
static u32 batadv_get_msglevel(struct net_device *dev); static u32 batadv_get_msglevel(struct net_device *dev);
static void batadv_set_msglevel(struct net_device *dev, u32 value); 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_strings(struct net_device *dev, u32 stringset, u8 *data);
static void batadv_get_ethtool_stats(struct net_device *dev, static void batadv_get_ethtool_stats(struct net_device *dev,
struct ethtool_stats *stats, u64 *data); struct ethtool_stats *stats, u64 *data);
...@@ -80,7 +79,7 @@ static const struct ethtool_ops batadv_ethtool_ops = { ...@@ -80,7 +79,7 @@ static const struct ethtool_ops batadv_ethtool_ops = {
.get_drvinfo = batadv_get_drvinfo, .get_drvinfo = batadv_get_drvinfo,
.get_msglevel = batadv_get_msglevel, .get_msglevel = batadv_get_msglevel,
.set_msglevel = batadv_set_msglevel, .set_msglevel = batadv_set_msglevel,
.get_link = batadv_get_link, .get_link = ethtool_op_get_link,
.get_strings = batadv_get_strings, .get_strings = batadv_get_strings,
.get_ethtool_stats = batadv_get_ethtool_stats, .get_ethtool_stats = batadv_get_ethtool_stats,
.get_sset_count = batadv_get_sset_count, .get_sset_count = batadv_get_sset_count,
...@@ -1119,11 +1118,6 @@ static void batadv_set_msglevel(struct net_device *dev, u32 value) ...@@ -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 /* Inspired by drivers/net/ethernet/dlink/sundance.c:1702
* Declare each description string in struct.name[] to get fixed sized buffer * Declare each description string in struct.name[] to get fixed sized buffer
* and compile time checking for strings longer than ETH_GSTRING_LEN. * and compile time checking for strings longer than ETH_GSTRING_LEN.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册