aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index f81fff5a3d34..2553173a16c4 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -748,7 +748,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
748 prefetch(next_rxd); 748 prefetch(next_rxd);
749 cleaned_count++; 749 cleaned_count++;
750 750
751 if (adapter->flags & IXGBE_FLAG_RSC_CAPABLE) 751 if (adapter->flags & IXGBE_FLAG2_RSC_CAPABLE)
752 rsc_count = ixgbe_get_rsc_count(rx_desc); 752 rsc_count = ixgbe_get_rsc_count(rx_desc);
753 753
754 if (rsc_count) { 754 if (rsc_count) {
@@ -1968,7 +1968,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
1968 IXGBE_WRITE_REG(hw, IXGBE_PSRTYPE(0), psrtype); 1968 IXGBE_WRITE_REG(hw, IXGBE_PSRTYPE(0), psrtype);
1969 } 1969 }
1970 } else { 1970 } else {
1971 if (!(adapter->flags & IXGBE_FLAG_RSC_ENABLED) && 1971 if (!(adapter->flags & IXGBE_FLAG2_RSC_ENABLED) &&
1972 (netdev->mtu <= ETH_DATA_LEN)) 1972 (netdev->mtu <= ETH_DATA_LEN))
1973 rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE; 1973 rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;
1974 else 1974 else
@@ -2097,7 +2097,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
2097 IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, rdrxctl); 2097 IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, rdrxctl);
2098 } 2098 }
2099 2099
2100 if (adapter->flags & IXGBE_FLAG_RSC_ENABLED) { 2100 if (adapter->flags & IXGBE_FLAG2_RSC_ENABLED) {
2101 /* Enable 82599 HW-RSC */ 2101 /* Enable 82599 HW-RSC */
2102 for (i = 0; i < adapter->num_rx_queues; i++) { 2102 for (i = 0; i < adapter->num_rx_queues; i++) {
2103 j = adapter->rx_ring[i].reg_idx; 2103 j = adapter->rx_ring[i].reg_idx;
@@ -3632,8 +3632,8 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
3632 adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82598; 3632 adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82598;
3633 } else if (hw->mac.type == ixgbe_mac_82599EB) { 3633 } else if (hw->mac.type == ixgbe_mac_82599EB) {
3634 adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82599; 3634 adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82599;
3635 adapter->flags |= IXGBE_FLAG_RSC_CAPABLE; 3635 adapter->flags |= IXGBE_FLAG2_RSC_CAPABLE;
3636 adapter->flags |= IXGBE_FLAG_RSC_ENABLED; 3636 adapter->flags |= IXGBE_FLAG2_RSC_ENABLED;
3637#ifdef IXGBE_FCOE 3637#ifdef IXGBE_FCOE
3638 adapter->flags |= IXGBE_FLAG_FCOE_ENABLED; 3638 adapter->flags |= IXGBE_FLAG_FCOE_ENABLED;
3639 adapter->ring_feature[RING_F_FCOE].indices = IXGBE_FCRETA_SIZE; 3639 adapter->ring_feature[RING_F_FCOE].indices = IXGBE_FCRETA_SIZE;
@@ -5323,7 +5323,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
5323 if (pci_using_dac) 5323 if (pci_using_dac)
5324 netdev->features |= NETIF_F_HIGHDMA; 5324 netdev->features |= NETIF_F_HIGHDMA;
5325 5325
5326 if (adapter->flags & IXGBE_FLAG_RSC_ENABLED) 5326 if (adapter->flags & IXGBE_FLAG2_RSC_ENABLED)
5327 netdev->features |= NETIF_F_LRO; 5327 netdev->features |= NETIF_F_LRO;
5328 5328
5329 /* make sure the EEPROM is good */ 5329 /* make sure the EEPROM is good */