diff options
author | Sony Chacko <sony.chacko@qlogic.com> | 2012-02-03 11:35:15 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-04 15:59:29 -0500 |
commit | 34d6fde187f169a1b155d091158f97ab34d93bab (patch) | |
tree | 6f72edbbc11c64e90513a6e87206ac1471a82241 /drivers/net/ethernet/qlogic | |
parent | b8c30812b479a53b717ad665728df55d30f784d5 (diff) | |
download | op-kernel-dev-34d6fde187f169a1b155d091158f97ab34d93bab.zip op-kernel-dev-34d6fde187f169a1b155d091158f97ab34d93bab.tar.gz |
netxen: report valid speed and duplex status when link is down
o Update version to 4.0.78
Signed-off-by: Sony Chacko <sony.chacko@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h index 8a35430..2eeac32 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h @@ -53,8 +53,8 @@ #define _NETXEN_NIC_LINUX_MAJOR 4 #define _NETXEN_NIC_LINUX_MINOR 0 -#define _NETXEN_NIC_LINUX_SUBVERSION 77 -#define NETXEN_NIC_LINUX_VERSIONID "4.0.77" +#define _NETXEN_NIC_LINUX_SUBVERSION 78 +#define NETXEN_NIC_LINUX_VERSIONID "4.0.78" #define NETXEN_VERSION_CODE(a, b, c) (((a) << 24) + ((b) << 16) + (c)) #define _major(v) (((v) >> 24) & 0xff) diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c index 3e73d35..8c39299 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c @@ -248,6 +248,11 @@ skip: } } + if (!netif_running(dev) || !adapter->ahw.linkup) { + ecmd->duplex = DUPLEX_UNKNOWN; + ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN); + } + return 0; } |