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

Commit 083ba279 authored by Amit Kumar Salecha's avatar Amit Kumar Salecha Committed by David S. Miller
Browse files

netxen: fix interrupt for NX2031 



Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>

For NX2031, msix is supported from fw version > 3.4.336.
This fw version check should take flash fw in consider instead of
running fw or fw from file.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e270299a

drivers/net/netxen/netxen_nic_main.c

+16 −9
Original line number Diff line number Diff line
@@ -772,7 +772,13 @@ netxen_check_options(struct netxen_adapter *adapter) 
	if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {

		adapter->msix_supported = !!use_msi_x;

		adapter->rss_supported = !!use_msi_x;

	} else if (adapter->fw_version >= NETXEN_VERSION_CODE(3, 4, 336)) {

	} else {

		u32 flashed_ver = 0;

		netxen_rom_fast_read(adapter,

				NX_FW_VERSION_OFFSET, (int *)&flashed_ver);

		flashed_ver = NETXEN_DECODE_VERSION(flashed_ver);



		if (flashed_ver >= NETXEN_VERSION_CODE(3, 4, 336)) {

			switch (adapter->ahw.board_type) {

			case NETXEN_BRDTYPE_P2_SB31_10G:

			case NETXEN_BRDTYPE_P2_SB31_10G_CX4:
@@ -783,6 +789,7 @@ netxen_check_options(struct netxen_adapter *adapter) 
				break;

			}

		}

	}



	adapter->num_txd = MAX_CMD_DESCRIPTORS;