diff options
author | Sony Chacko <sony.chacko@qlogic.com> | 2012-02-03 06:35:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-04 15:59:29 -0500 |
commit | 34d6fde187f169a1b155d091158f97ab34d93bab (patch) | |
tree | 6f72edbbc11c64e90513a6e87206ac1471a82241 | |
parent | b8c30812b479a53b717ad665728df55d30f784d5 (diff) |
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>
-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 8a35430b2f8b..2eeac32f7fdd 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h | |||
@@ -53,8 +53,8 @@ | |||
53 | 53 | ||
54 | #define _NETXEN_NIC_LINUX_MAJOR 4 | 54 | #define _NETXEN_NIC_LINUX_MAJOR 4 |
55 | #define _NETXEN_NIC_LINUX_MINOR 0 | 55 | #define _NETXEN_NIC_LINUX_MINOR 0 |
56 | #define _NETXEN_NIC_LINUX_SUBVERSION 77 | 56 | #define _NETXEN_NIC_LINUX_SUBVERSION 78 |
57 | #define NETXEN_NIC_LINUX_VERSIONID "4.0.77" | 57 | #define NETXEN_NIC_LINUX_VERSIONID "4.0.78" |
58 | 58 | ||
59 | #define NETXEN_VERSION_CODE(a, b, c) (((a) << 24) + ((b) << 16) + (c)) | 59 | #define NETXEN_VERSION_CODE(a, b, c) (((a) << 24) + ((b) << 16) + (c)) |
60 | #define _major(v) (((v) >> 24) & 0xff) | 60 | #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 3e73d35cceaa..8c39299331a2 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: | |||
248 | } | 248 | } |
249 | } | 249 | } |
250 | 250 | ||
251 | if (!netif_running(dev) || !adapter->ahw.linkup) { | ||
252 | ecmd->duplex = DUPLEX_UNKNOWN; | ||
253 | ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN); | ||
254 | } | ||
255 | |||
251 | return 0; | 256 | return 0; |
252 | } | 257 | } |
253 | 258 | ||