From 893e4161e72792565e485c6cdf685d78e02d0ddd Mon Sep 17 00:00:00 2001 From: Dhananjay Phadke Date: Tue, 28 Apr 2009 15:29:09 +0000 Subject: [PATCH] --- yaml --- r: 150055 b: refs/heads/master c: 5103c9f7874506cb40fc3c8d3f22486d3c4d91aa h: refs/heads/master i: 150053: 556fa8cea2b5249a86b843898eb697bfccb9baa3 150051: 72ce19875895928433fa4332783a9792c2bf1037 150047: f5d90eda764cd00d4cc6500c7c5e5509bd0de822 v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_ethtool.c | 1 + trunk/drivers/net/netxen/netxen_nic_main.c | 2 +- trunk/drivers/net/netxen/netxen_nic_phan_reg.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cb5df2c81024..51adf08ab220 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c31d55f755ff2bc1f7dc3b45c500032fe90aff8 +refs/heads/master: 5103c9f7874506cb40fc3c8d3f22486d3c4d91aa diff --git a/trunk/drivers/net/netxen/netxen_nic_ethtool.c b/trunk/drivers/net/netxen/netxen_nic_ethtool.c index a452b2facb77..e16ea46c24b8 100644 --- a/trunk/drivers/net/netxen/netxen_nic_ethtool.c +++ b/trunk/drivers/net/netxen/netxen_nic_ethtool.c @@ -247,6 +247,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) case LINKEVENT_MODULE_TWINAX_UNSUPPORTED_CABLELEN: case LINKEVENT_MODULE_TWINAX: ecmd->port = PORT_TP; + break; default: ecmd->port = -1; } diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c index e877eefdfeb0..8331580fe161 100644 --- a/trunk/drivers/net/netxen/netxen_nic_main.c +++ b/trunk/drivers/net/netxen/netxen_nic_main.c @@ -797,7 +797,7 @@ netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev) if (adapter->max_sds_rings > 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); return 0; diff --git a/trunk/drivers/net/netxen/netxen_nic_phan_reg.h b/trunk/drivers/net/netxen/netxen_nic_phan_reg.h index 845dcf436cf6..b73a62ca74f8 100644 --- a/trunk/drivers/net/netxen/netxen_nic_phan_reg.h +++ b/trunk/drivers/net/netxen/netxen_nic_phan_reg.h @@ -126,6 +126,7 @@ #define CRB_SW_INT_MASK_2 NETXEN_NIC_REG(0x1e4) #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) /* @@ -136,7 +137,6 @@ #define CRB_NIC_CAPABILITIES_FW NETXEN_NIC_REG(0x1dc) #define CRB_NIC_MSI_MODE_HOST NETXEN_NIC_REG(0x270) #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 MSI_MODE_MULTIFUNC 0x1