ethtool: Report link-down while interface is down
Subsystems (3)
PATCH 1/2 ethtool: Report link-down while interface is down
While an interface is down, many implementations of ethtool_ops::get_link, including the default, ethtool_op_get_link(), will report the last link state seen while the interface was up. In general the current physical link state is not available if the interface is down.
Define ETHTOOL_GLINK to reflect whether the interface *and* any physical port have a working link, and consistently return 0 when the interface is down.
---
David,
I know you weren't keen on this, but if you don't accept it then please say what you think the proper semantics are.
Ben.
include/linux/ethtool.h | 4 +++- net/core/ethtool.c | 17 +++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-)
include/linux/ethtool.h +3 -1
@@ -691,7 +691,9 @@ struct ethtool_ops {#define ETHTOOL_GMSGLVL 0x00000007/* Get driver message level */ #define ETHTOOL_SMSGLVL 0x00000008/* Set driver msg level. */ #define ETHTOOL_NWAY_RST 0x00000009/* Restart autonegotiation. */ -#define ETHTOOL_GLINK 0x0000000a/* Get link status (ethtool_value) */ +/* Get link status for host, i.e. whether the interface *and* the +* physical port (if there is one) are up (ethtool_value). */ +#define ETHTOOL_GLINK 0x0000000a#define ETHTOOL_GEEPROM 0x0000000b/* Get EEPROM data */ #define ETHTOOL_SEEPROM 0x0000000c/* Set EEPROM data. */ #define ETHTOOL_GCOALESCE 0x0000000e/* Get coalesce config */
net/core/ethtool.c +15 -2
@@ -891,6 +891,20 @@ static int ethtool_nway_reset(struct net_device *dev)return dev->ethtool_ops->nway_reset (dev); } +static int ethtool_get_link (struct net_device *dev,char __user *useraddr) +{ +struct ethtool_value edata = { .cmd =ETHTOOL_GLINK }; + +if (!dev->ethtool_ops->get_link) +return -EOPNOTSUPP ; + + edata.data =netif_running (dev) && dev->ethtool_ops->get_link (dev); + +if (copy_to_user (useraddr, &edata,sizeof (edata))) +return -EFAULT ; +return 0 ; +} +static int ethtool_get_eeprom (struct net_device *dev,void __user *useraddr) {struct ethtool_eeprom eeprom;
@@ -1530,8 +1544,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) rc =ethtool_nway_reset (dev);break ;case ETHTOOL_GLINK : - rc =ethtool_get_value (dev, useraddr, ethcmd, - dev->ethtool_ops->get_link); + rc =ethtool_get_link (dev, useraddr);break ;case ETHTOOL_GEEPROM : rc =ethtool_get_eeprom (dev, useraddr);
Signature · 8 lines
1.7.3.2 -- Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
From: Ben Hutchings <[email protected]>
Date: Thu, 09 Dec 2010 22:08:35 +0000
Quoted 10 lines
While an interface is down, many implementations of
ethtool_ops::get_link, including the default,ethtool_op_get_link(), will report the last link state seen while the interface was up. In general the current physical link state is not available if the interface is down.Define
ETHTOOL_GLINKto reflect whether the interface *and* any physical port have a working link, and consistently return 0 when the interface is down.
Quoted 6 lines
Signed-off-by Ben Hutchings <[email protected]>---
David,I know you weren't keen on this, but if you don't accept it then please say what you think the proper semantics are.
No, I'm actually fine with this.
Applied, thanks Ben!