1 files changed, 53 insertions, 11 deletions

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index febde45cf9fa..07e778d3e5d2 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2841,11 +2841,55 @@ static inline bool ixgbe_cache_ring_dcb(struct ixgbe_adapter *adapter)
                         }
                         ret = true;
                 } else if (adapter->hw.mac.type == ixgbe_mac_82599EB) {
-                        for (i = 0; i < dcb_i; i++) {
-                                adapter->rx_ring[i].reg_idx = i << 4;
-                                adapter->tx_ring[i].reg_idx = i << 4;
+                        if (dcb_i == 8) {
+                                /*
+                                 * Tx TC0 starts at: descriptor queue 0
+                                 * Tx TC1 starts at: descriptor queue 32
+                                 * Tx TC2 starts at: descriptor queue 64
+                                 * Tx TC3 starts at: descriptor queue 80
+                                 * Tx TC4 starts at: descriptor queue 96
+                                 * Tx TC5 starts at: descriptor queue 104
+                                 * Tx TC6 starts at: descriptor queue 112
+                                 * Tx TC7 starts at: descriptor queue 120
+                                 *
+                                 * Rx TC0-TC7 are offset by 16 queues each
+                                 */
+                                for (i = 0; i < 3; i++) {
+                                        adapter->tx_ring[i].reg_idx = i << 5;
+                                        adapter->rx_ring[i].reg_idx = i << 4;
+                                }
+                                for ( ; i < 5; i++) {
+                                        adapter->tx_ring[i].reg_idx =
+                                                                 ((i + 2) << 4);
+                                        adapter->rx_ring[i].reg_idx = i << 4;
+                                }
+                                for ( ; i < dcb_i; i++) {
+                                        adapter->tx_ring[i].reg_idx =
+                                                                 ((i + 8) << 3);
+                                        adapter->rx_ring[i].reg_idx = i << 4;
+                                }
+
+                                ret = true;
+                        } else if (dcb_i == 4) {
+                                /*
+                                 * Tx TC0 starts at: descriptor queue 0
+                                 * Tx TC1 starts at: descriptor queue 64
+                                 * Tx TC2 starts at: descriptor queue 96
+                                 * Tx TC3 starts at: descriptor queue 112
+                                 *
+                                 * Rx TC0-TC3 are offset by 32 queues each
+                                 */
+                                adapter->tx_ring[0].reg_idx = 0;
+                                adapter->tx_ring[1].reg_idx = 64;
+                                adapter->tx_ring[2].reg_idx = 96;
+                                adapter->tx_ring[3].reg_idx = 112;
+                                for (i = 0 ; i < dcb_i; i++)
+                                        adapter->rx_ring[i].reg_idx = i << 5;
+
+                                ret = true;
+                        } else {
+                                ret = false;
                         }
-                        ret = true;
                 } else {
                         ret = false;
                 }
@@ -3602,6 +3646,8 @@ static int ixgbe_resume(struct pci_dev *pdev)
 
         ixgbe_reset(adapter);
 
+        IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);
+
         if (netif_running(netdev)) {
                 err = ixgbe_open(adapter->netdev);
                 if (err)
@@ -3946,7 +3992,7 @@ static void ixgbe_sfp_config_module_task(struct work_struct *work)
         }
         hw->mac.ops.setup_sfp(hw);
 
-        if (!adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK)
+        if (!(adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK))
                 /* This will also work for DA Twinax connections */
                 schedule_work(&adapter->multispeed_fiber_task);
         adapter->flags &= ~IXGBE_FLAG_IN_SFP_MOD_TASK;
@@ -4531,7 +4577,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data];
         static int cards_found;
         int i, err, pci_using_dac;
-        u16 pm_value = 0;
         u32 part_num, eec;
 
         err = pci_enable_device(pdev);
@@ -4719,11 +4764,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 
         switch (pdev->device) {
         case IXGBE_DEV_ID_82599_KX4:
-#define IXGBE_PCIE_PMCSR 0x44
-                adapter->wol = IXGBE_WUFC_MAG;
-                pci_read_config_word(pdev, IXGBE_PCIE_PMCSR, &pm_value);
-                pci_write_config_word(pdev, IXGBE_PCIE_PMCSR,
-                                      (pm_value | (1 << 8)));
+                adapter->wol = (IXGBE_WUFC_MAG | IXGBE_WUFC_EX |
+                                IXGBE_WUFC_MC | IXGBE_WUFC_BC);
                 break;
         default:
                 adapter->wol = 0;