1 files changed, 12 insertions, 10 deletions

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 6f8adc7f5d7c..200ae7e60ba0 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -51,8 +51,12 @@
 char ixgbe_driver_name[] = "ixgbe";
 static const char ixgbe_driver_string[] =
                               "Intel(R) 10 Gigabit PCI Express Network Driver";
-
-#define DRV_VERSION "3.2.9-k2"
+#define MAJ 3
+#define MIN 2
+#define BUILD 9
+#define KFIX 2
+#define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
+        __stringify(BUILD) "-k" __stringify(KFIX)
 const char ixgbe_driver_version[] = DRV_VERSION;
 static const char ixgbe_copyright[] =
                                 "Copyright (c) 1999-2011 Intel Corporation.";
@@ -120,6 +124,8 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = {
          board_82599 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T),
          board_X540 },
+        {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF2),
+         board_82599 },
 
         /* required last entry */
         {0, }
@@ -943,8 +949,6 @@ static void ixgbe_update_rx_dca(struct ixgbe_adapter *adapter,
         rxctrl |= IXGBE_DCA_RXCTRL_DESC_DCA_EN;
         rxctrl |= IXGBE_DCA_RXCTRL_HEAD_DCA_EN;
         rxctrl &= ~(IXGBE_DCA_RXCTRL_DESC_RRO_EN);
-        rxctrl &= ~(IXGBE_DCA_RXCTRL_DESC_WRO_EN |
-                    IXGBE_DCA_RXCTRL_DESC_HSRO_EN);
         IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(reg_idx), rxctrl);
 }
 
@@ -962,7 +966,6 @@ static void ixgbe_update_tx_dca(struct ixgbe_adapter *adapter,
                 txctrl &= ~IXGBE_DCA_TXCTRL_CPUID_MASK;
                 txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
                 txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
-                txctrl &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
                 IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(reg_idx), txctrl);
                 break;
         case ixgbe_mac_82599EB:
@@ -972,7 +975,6 @@ static void ixgbe_update_tx_dca(struct ixgbe_adapter *adapter,
                 txctrl |= (dca3_get_tag(&adapter->pdev->dev, cpu) <<
                            IXGBE_DCA_TXCTRL_CPUID_SHIFT_82599);
                 txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
-                txctrl &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
                 IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL_82599(reg_idx), txctrl);
                 break;
         default:
@@ -2731,7 +2733,7 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,
 
         /* poll to verify queue is enabled */
         do {
-                msleep(1);
+                usleep_range(1000, 2000);
                 txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(reg_idx));
         } while (--wait_loop && !(txdctl & IXGBE_TXDCTL_ENABLE));
         if (!wait_loop)
@@ -3023,7 +3025,7 @@ static void ixgbe_rx_desc_queue_enable(struct ixgbe_adapter *adapter,
                 return;
 
         do {
-                msleep(1);
+                usleep_range(1000, 2000);
                 rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx));
         } while (--wait_loop && !(rxdctl & IXGBE_RXDCTL_ENABLE));
 
@@ -3945,7 +3947,7 @@ void ixgbe_reinit_locked(struct ixgbe_adapter *adapter)
 {
         WARN_ON(in_interrupt());
         while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
-                msleep(1);
+                usleep_range(1000, 2000);
         ixgbe_down(adapter);
         /*
          * If SR-IOV enabled then wait a bit before bringing the adapter
@@ -4150,7 +4152,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
                 /* this call also flushes the previous write */
                 ixgbe_disable_rx_queue(adapter, adapter->rx_ring[i]);
 
-        msleep(10);
+        usleep_range(10000, 20000);
 
         netif_tx_stop_all_queues(netdev);