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

Revert "ixgbe: disable MSI-X by default on certain Cisco adapters"

Browse Source 
This reverts commit d5ffd75a27.

As requested by Jeff Kircher.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2010-05-03 15:18:22 -07:00
parent cd7b5396e7
commit 26d27844df
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ixgbe/ixgbe.h
View File

@@ -104,10 +104,6 @@
#define MAX_EMULATION_MAC_ADDRS 16 #define MAX_EMULATION_MAC_ADDRS 16
#define VMDQ_P(p) ((p) + adapter->num_vfs) #define VMDQ_P(p) ((p) + adapter->num_vfs)
#define IXGBE_SUBDEV_ID_82598AF_MEZZ 0x0049
#define IXGBE_SUBDEV_ID_82598AF_MENLO_Q_MEZZ 0x004a
#define IXGBE_SUBDEV_ID_82598AF_MENLO_E_MEZZ 0x004b
struct vf_data_storage { struct vf_data_storage {
unsigned char vf_mac_addresses[ETH_ALEN]; unsigned char vf_mac_addresses[ETH_ALEN];
u16 vf_mc_hashes[IXGBE_MAX_VF_MC_ENTRIES]; u16 vf_mc_hashes[IXGBE_MAX_VF_MC_ENTRIES];

17
drivers/net/ixgbe/ixgbe_main.c
View File

@@ -4314,9 +4314,6 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
int err = 0; int err = 0;
int vector, v_budget; int vector, v_budget;
if (!(adapter->flags & IXGBE_FLAG_MSIX_CAPABLE))
goto try_msi;
/* /*
* It's easy to be greedy for MSI-X vectors, but it really * It's easy to be greedy for MSI-X vectors, but it really
* doesn't do us much good if we have a lot more vectors * doesn't do us much good if we have a lot more vectors
@@ -4348,7 +4345,7 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
goto out; goto out;
} }
try_msi:
adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED; adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED; adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;
adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE; adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
@@ -4629,18 +4626,6 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
adapter->ring_feature[RING_F_RSS].indices = rss; adapter->ring_feature[RING_F_RSS].indices = rss;
adapter->flags |= IXGBE_FLAG_RSS_ENABLED; adapter->flags |= IXGBE_FLAG_RSS_ENABLED;
adapter->ring_feature[RING_F_DCB].indices = IXGBE_MAX_DCB_INDICES; adapter->ring_feature[RING_F_DCB].indices = IXGBE_MAX_DCB_INDICES;
adapter->flags |= IXGBE_FLAG_MSIX_CAPABLE;
if (adapter->hw.device_id == IXGBE_DEV_ID_82598AF_DUAL_PORT) {
switch (adapter->hw.subsystem_device_id) {
case IXGBE_SUBDEV_ID_82598AF_MEZZ:
case IXGBE_SUBDEV_ID_82598AF_MENLO_Q_MEZZ:
case IXGBE_SUBDEV_ID_82598AF_MENLO_E_MEZZ:
adapter->flags &= ~IXGBE_FLAG_MSIX_CAPABLE;
break;
default:
break;
}
}
if (hw->mac.type == ixgbe_mac_82598EB) { if (hw->mac.type == ixgbe_mac_82598EB) {
if (hw->device_id == IXGBE_DEV_ID_82598AT) if (hw->device_id == IXGBE_DEV_ID_82598AT)
adapter->flags |= IXGBE_FLAG_FAN_FAIL_CAPABLE; adapter->flags |= IXGBE_FLAG_FAN_FAIL_CAPABLE;