Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a777c892 authored by Manish chopra's avatar Manish chopra Committed by David S. Miller
Browse files

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: default avatarManish chopra <manish.chopra@qlogic.com>
Signed-off-by: default avatarRajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0087b29

drivers/net/ethernet/qlogic/netxen/netxen_nic.h

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ 


#define _NETXEN_NIC_LINUX_MAJOR 4

#define _NETXEN_NIC_LINUX_MINOR 0

#define _NETXEN_NIC_LINUX_SUBVERSION 79

#define NETXEN_NIC_LINUX_VERSIONID  "4.0.79"

#define _NETXEN_NIC_LINUX_SUBVERSION 80

#define NETXEN_NIC_LINUX_VERSIONID  "4.0.80"



#define NETXEN_VERSION_CODE(a, b, c)	(((a) << 24) + ((b) << 16) + (c))

#define _major(v)	(((v) >> 24) & 0xff)

drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c

+10 −3
Original line number Diff line number Diff line
@@ -826,7 +826,12 @@ netxen_get_dump_flag(struct net_device *netdev, struct ethtool_dump *dump) 
		dump->len = mdump->md_dump_size;

	else

		dump->len = 0;



	if (!mdump->md_enabled)

		dump->flag = ETH_FW_DUMP_DISABLE;

	else

		dump->flag = mdump->md_capture_mask;



	dump->version = adapter->fw_version;

	return 0;

}
@@ -840,8 +845,10 @@ netxen_set_dump(struct net_device *netdev, struct ethtool_dump *val) 


	switch (val->flag) {

	case NX_FORCE_FW_DUMP_KEY:

		if (!mdump->md_enabled)

			mdump->md_enabled = 1;

		if (!mdump->md_enabled) {

			netdev_info(netdev, "FW dump not enabled\n");

			return 0;

		}

		if (adapter->fw_mdump_rdy) {

			netdev_info(netdev, "Previous dump not cleared, not forcing dump\n");

			return 0;