diff options
| author | Amit Kumar Salecha <amit.salecha@qlogic.com> | 2010-03-29 02:43:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-29 13:18:38 -0700 |
| commit | 083ba279d52bcad20f1dfa3cefd4255cbe82d521 (patch) | |
| tree | f2026c292bacf345792d3a59ff804177eb45534f /drivers/net/netxen/netxen_nic_main.c | |
| parent | e270299a2f7a3040fe598113f74c2a7d5f63b582 (diff) | |
| download | linux-083ba279d52bcad20f1dfa3cefd4255cbe82d521.tar.gz | |
netxen: fix interrupt for NX2031
Signed-off-by: Amit 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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 68903bf06cf6..f1daa9a8be07 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -772,15 +772,22 @@ 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)) { - switch (adapter->ahw.board_type) { - case NETXEN_BRDTYPE_P2_SB31_10G: - case NETXEN_BRDTYPE_P2_SB31_10G_CX4: - adapter->msix_supported = !!use_msi_x; - adapter->rss_supported = !!use_msi_x; - break; - default: - break; + } 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: + adapter->msix_supported = !!use_msi_x; + adapter->rss_supported = !!use_msi_x; + break; + default: + break; + } } } |