hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netxen_nic: restrict force firmware dump when dump is disabled. 

o Set the ethtool_dump flag (=ETH_FW_DUMP_DISABLE) when dump is disabled.
o update driver version to 4.0.80

Signed-off-by: Manish chopra <manish.chopra@qlogic.com>
Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Manish chopra 2012-06-28 20:12:21 +00:00 committed by David S. Miller
parent d0087b29f7
commit a777c892ce
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/qlogic/netxen/netxen_nic.h
View File

@ -53,8 +53,8 @@
#define _NETXEN_NIC_LINUX_MAJOR 4 #define _NETXEN_NIC_LINUX_MAJOR 4
#define _NETXEN_NIC_LINUX_MINOR 0 #define _NETXEN_NIC_LINUX_MINOR 0
#define _NETXEN_NIC_LINUX_SUBVERSION 79 #define _NETXEN_NIC_LINUX_SUBVERSION 80
#define NETXEN_NIC_LINUX_VERSIONID "4.0.79" #define NETXEN_NIC_LINUX_VERSIONID "4.0.80"
#define NETXEN_VERSION_CODE(a, b, c) (((a) << 24) + ((b) << 16) + (c)) #define NETXEN_VERSION_CODE(a, b, c) (((a) << 24) + ((b) << 16) + (c))
#define _major(v) (((v) >> 24) & 0xff) #define _major(v) (((v) >> 24) & 0xff)

13
drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
View File

@ -826,7 +826,12 @@ netxen_get_dump_flag(struct net_device *netdev, struct ethtool_dump *dump)
dump->len = mdump->md_dump_size; dump->len = mdump->md_dump_size;
else else
dump->len = 0; dump->len = 0;
dump->flag = mdump->md_capture_mask;
if (!mdump->md_enabled)
dump->flag = ETH_FW_DUMP_DISABLE;
else
dump->flag = mdump->md_capture_mask;
dump->version = adapter->fw_version; dump->version = adapter->fw_version;
return 0; return 0;
} }
@ -840,8 +845,10 @@ netxen_set_dump(struct net_device *netdev, struct ethtool_dump *val)
switch (val->flag) { switch (val->flag) {
case NX_FORCE_FW_DUMP_KEY: case NX_FORCE_FW_DUMP_KEY:
if (!mdump->md_enabled) if (!mdump->md_enabled) {
mdump->md_enabled = 1; netdev_info(netdev, "FW dump not enabled\n");
return 0;
}
if (adapter->fw_mdump_rdy) { if (adapter->fw_mdump_rdy) {
netdev_info(netdev, "Previous dump not cleared, not forcing dump\n"); netdev_info(netdev, "Previous dump not cleared, not forcing dump\n");
return 0; return 0;