lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netxen: fix link event handling

Browse Source 
Firmware starting 4.0.402 started supporting link events, disable
it for older firmwares.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dhananjay Phadke
2009-04-28 15:29:09 +00:00
committed by David S. Miller
parent 6c31d55f75
commit 5103c9f787
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/netxen/netxen_nic_ethtool.c
View File

@@ -247,6 +247,7 @@ skip:
case LINKEVENT_MODULE_TWINAX_UNSUPPORTED_CABLELEN: case LINKEVENT_MODULE_TWINAX_UNSUPPORTED_CABLELEN:
case LINKEVENT_MODULE_TWINAX: case LINKEVENT_MODULE_TWINAX:
ecmd->port = PORT_TP; ecmd->port = PORT_TP;
break;
default: default:
ecmd->port = -1; ecmd->port = -1;
} }

2
drivers/net/netxen/netxen_nic_main.c
View File

@@ -797,7 +797,7 @@ netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)
if (adapter->max_sds_rings > 1) if (adapter->max_sds_rings > 1)
netxen_config_rss(adapter, 1); netxen_config_rss(adapter, 1);
if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) if (adapter->capabilities & NX_FW_CAPABILITY_LINK_NOTIFICATION)
netxen_linkevent_request(adapter, 1); netxen_linkevent_request(adapter, 1);
return 0; return 0;

2
drivers/net/netxen/netxen_nic_phan_reg.h
View File

@@ -126,6 +126,7 @@
#define CRB_SW_INT_MASK_2 NETXEN_NIC_REG(0x1e4) #define CRB_SW_INT_MASK_2 NETXEN_NIC_REG(0x1e4)
#define CRB_SW_INT_MASK_3 NETXEN_NIC_REG(0x1e8) #define CRB_SW_INT_MASK_3 NETXEN_NIC_REG(0x1e8)
#define CRB_FW_CAPABILITIES_1 NETXEN_CAM_RAM(0x128)
#define CRB_MAC_BLOCK_START NETXEN_CAM_RAM(0x1c0) #define CRB_MAC_BLOCK_START NETXEN_CAM_RAM(0x1c0)
/* /*
@@ -136,7 +137,6 @@
#define CRB_NIC_CAPABILITIES_FW NETXEN_NIC_REG(0x1dc) #define CRB_NIC_CAPABILITIES_FW NETXEN_NIC_REG(0x1dc)
#define CRB_NIC_MSI_MODE_HOST NETXEN_NIC_REG(0x270) #define CRB_NIC_MSI_MODE_HOST NETXEN_NIC_REG(0x270)
#define CRB_NIC_MSI_MODE_FW NETXEN_NIC_REG(0x274) #define CRB_NIC_MSI_MODE_FW NETXEN_NIC_REG(0x274)
#define CRB_FW_CAPABILITIES_1 NETXEN_NIC_REG(0x128)
#define INTR_SCHEME_PERPORT 0x1 #define INTR_SCHEME_PERPORT 0x1
#define MSI_MODE_MULTIFUNC 0x1 #define MSI_MODE_MULTIFUNC 0x1