5 files changed, 29 insertions, 55 deletions

diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index 2c4dc8221dcd..8f1f8bab0fd9 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -233,10 +233,6 @@ struct ixgbe_q_vector {
 #define IXGBE_TX_CTXTDESC_ADV(R, i)         \
         (&(((struct ixgbe_adv_tx_context_desc *)((R).desc))[i]))
 
-#define IXGBE_GET_DESC(R, i, type)      (&(((struct type *)((R).desc))[i]))
-#define IXGBE_TX_DESC(R, i)     IXGBE_GET_DESC(R, i, ixgbe_legacy_tx_desc)
-#define IXGBE_RX_DESC(R, i)     IXGBE_GET_DESC(R, i, ixgbe_legacy_rx_desc)
-
 #define IXGBE_MAX_JUMBO_FRAME_SIZE        16128
 #ifdef IXGBE_FCOE
 /* Use 3K as the baby jumbo frame size for FCoE */
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index 522c03bc1dad..1c227b0777a6 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -334,6 +334,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)
                 media_type = ixgbe_media_type_fiber;
                 break;
         case IXGBE_DEV_ID_82598AT:
+        case IXGBE_DEV_ID_82598AT2:
                 media_type = ixgbe_media_type_copper;
                 break;
         default:
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 79144e950a34..c6db9a04187d 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1440,7 +1440,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
                 goto err_nomem;
         }
 
-        tx_ring->size = tx_ring->count * sizeof(struct ixgbe_legacy_tx_desc);
+        tx_ring->size = tx_ring->count * sizeof(union ixgbe_adv_tx_desc);
         tx_ring->size = ALIGN(tx_ring->size, 4096);
         if (!(tx_ring->desc = pci_alloc_consistent(pdev, tx_ring->size,
                                                    &tx_ring->dma))) {
@@ -1454,7 +1454,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_TDBAH(0),
                         ((u64) tx_ring->dma >> 32));
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_TDLEN(0),
-                        tx_ring->count * sizeof(struct ixgbe_legacy_tx_desc));
+                        tx_ring->count * sizeof(union ixgbe_adv_tx_desc));
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_TDH(0), 0);
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_TDT(0), 0);
 
@@ -1472,7 +1472,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_TXDCTL(0), reg_data);
 
         for (i = 0; i < tx_ring->count; i++) {
-                struct ixgbe_legacy_tx_desc *desc = IXGBE_TX_DESC(*tx_ring, i);
+                union ixgbe_adv_tx_desc *desc = IXGBE_TX_DESC_ADV(*tx_ring, i);
                 struct sk_buff *skb;
                 unsigned int size = 1024;
 
@@ -1486,13 +1486,18 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
                 tx_ring->tx_buffer_info[i].length = skb->len;
                 tx_ring->tx_buffer_info[i].dma =
                         pci_map_single(pdev, skb->data, skb->len,
-                                        PCI_DMA_TODEVICE);
-                desc->buffer_addr = cpu_to_le64(tx_ring->tx_buffer_info[i].dma);
-                desc->lower.data = cpu_to_le32(skb->len);
-                desc->lower.data |= cpu_to_le32(IXGBE_TXD_CMD_EOP |
-                                                IXGBE_TXD_CMD_IFCS |
-                                                IXGBE_TXD_CMD_RS);
-                desc->upper.data = 0;
+                                       PCI_DMA_TODEVICE);
+                desc->read.buffer_addr =
+                                    cpu_to_le64(tx_ring->tx_buffer_info[i].dma);
+                desc->read.cmd_type_len = cpu_to_le32(skb->len);
+                desc->read.cmd_type_len |= cpu_to_le32(IXGBE_TXD_CMD_EOP |
+                                                       IXGBE_TXD_CMD_IFCS |
+                                                       IXGBE_TXD_CMD_RS);
+                desc->read.olinfo_status = 0;
+                if (adapter->hw.mac.type == ixgbe_mac_82599EB)
+                        desc->read.olinfo_status |=
+                                        (skb->len << IXGBE_ADVTXD_PAYLEN_SHIFT);
+
         }
 
         /* Setup Rx Descriptor ring and Rx buffers */
@@ -1508,7 +1513,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
                 goto err_nomem;
         }
 
-        rx_ring->size = rx_ring->count * sizeof(struct ixgbe_legacy_rx_desc);
+        rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc);
         rx_ring->size = ALIGN(rx_ring->size, 4096);
         if (!(rx_ring->desc = pci_alloc_consistent(pdev, rx_ring->size,
                                                    &rx_ring->dma))) {
@@ -1566,8 +1571,8 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_RXCTRL, rctl);
 
         for (i = 0; i < rx_ring->count; i++) {
-                struct ixgbe_legacy_rx_desc *rx_desc =
-                                        IXGBE_RX_DESC(*rx_ring, i);
+                union ixgbe_adv_rx_desc *rx_desc =
+                                                 IXGBE_RX_DESC_ADV(*rx_ring, i);
                 struct sk_buff *skb;
 
                 skb = alloc_skb(IXGBE_RXBUFFER_2048 + NET_IP_ALIGN, GFP_KERNEL);
@@ -1580,7 +1585,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
                 rx_ring->rx_buffer_info[i].dma =
                         pci_map_single(pdev, skb->data, IXGBE_RXBUFFER_2048,
                                        PCI_DMA_FROMDEVICE);
-                rx_desc->buffer_addr =
+                rx_desc->read.pkt_addr =
                                 cpu_to_le64(rx_ring->rx_buffer_info[i].dma);
                 memset(skb->data, 0x00, skb->len);
         }
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index e3cb949b9aa9..71df9ed9b534 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -49,7 +49,7 @@ char ixgbe_driver_name[] = "ixgbe";
 static const char ixgbe_driver_string[] =
                               "Intel(R) 10 Gigabit PCI Express Network Driver";
 
-#define DRV_VERSION "2.0.34-k2"
+#define DRV_VERSION "2.0.37-k2"
 const char ixgbe_driver_version[] = DRV_VERSION;
 static char ixgbe_copyright[] = "Copyright (c) 1999-2009 Intel Corporation.";
 
@@ -75,6 +75,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
          board_82598 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT),
          board_82598 },
+        {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT2),
+         board_82598 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4),
          board_82598 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT),
@@ -4634,13 +4636,13 @@ static void ixgbe_watchdog_task(struct work_struct *work)
                         if (hw->mac.type == ixgbe_mac_82599EB) {
                                 u32 mflcn = IXGBE_READ_REG(hw, IXGBE_MFLCN);
                                 u32 fccfg = IXGBE_READ_REG(hw, IXGBE_FCCFG);
-                                flow_rx = (mflcn & IXGBE_MFLCN_RFCE);
-                                flow_tx = (fccfg & IXGBE_FCCFG_TFCE_802_3X);
+                                flow_rx = !!(mflcn & IXGBE_MFLCN_RFCE);
+                                flow_tx = !!(fccfg & IXGBE_FCCFG_TFCE_802_3X);
                         } else {
                                 u32 frctl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
                                 u32 rmcs = IXGBE_READ_REG(hw, IXGBE_RMCS);
-                                flow_rx = (frctl & IXGBE_FCTRL_RFCE);
-                                flow_tx = (rmcs & IXGBE_RMCS_TFCE_802_3X);
+                                flow_rx = !!(frctl & IXGBE_FCTRL_RFCE);
+                                flow_tx = !!(rmcs & IXGBE_RMCS_TFCE_802_3X);
                         }
 
                         printk(KERN_INFO "ixgbe: %s NIC Link is Up %s, "
@@ -5100,7 +5102,7 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)
                 return smp_processor_id();
 
         if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
-                return 0;  /* All traffic should default to class 0 */
+                return (skb->vlan_tci & IXGBE_TX_FLAGS_VLAN_PRIO_MASK) >> 13;
 
         return skb_tx_hash(dev, skb);
 }
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index be90eb4575f6..f0f3406ef001 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -42,6 +42,7 @@
 #define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7
 #define IXGBE_DEV_ID_82598EB_SFP_LOM     0x10DB
 #define IXGBE_DEV_ID_82598AT             0x10C8
+#define IXGBE_DEV_ID_82598AT2            0x150B
 #define IXGBE_DEV_ID_82598EB_CX4         0x10DD
 #define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC
 #define IXGBE_DEV_ID_82598_DA_DUAL_PORT  0x10F1
@@ -1901,27 +1902,6 @@ enum ixgbe_fdir_pballoc_type {
 #define IXGBE_FDIR_INIT_DONE_POLL               10
 #define IXGBE_FDIRCMD_CMD_POLL                  10
 
-/* Transmit Descriptor - Legacy */
-struct ixgbe_legacy_tx_desc {
-        u64 buffer_addr;       /* Address of the descriptor's data buffer */
-        union {
-                __le32 data;
-                struct {
-                        __le16 length;    /* Data buffer length */
-                        u8 cso;           /* Checksum offset */
-                        u8 cmd;           /* Descriptor control */
-                } flags;
-        } lower;
-        union {
-                __le32 data;
-                struct {
-                        u8 status;        /* Descriptor status */
-                        u8 css;           /* Checksum start */
-                        __le16 vlan;
-                } fields;
-        } upper;
-};
-
 /* Transmit Descriptor - Advanced */
 union ixgbe_adv_tx_desc {
         struct {
@@ -1936,16 +1916,6 @@ union ixgbe_adv_tx_desc {
         } wb;
 };
 
-/* Receive Descriptor - Legacy */
-struct ixgbe_legacy_rx_desc {
-        __le64 buffer_addr; /* Address of the descriptor's data buffer */
-        __le16 length;      /* Length of data DMAed into data buffer */
-        __le16 csum;        /* Packet checksum */
-        u8 status;          /* Descriptor status */
-        u8 errors;          /* Descriptor Errors */
-        __le16 vlan;
-};
-
 /* Receive Descriptor - Advanced */
 union ixgbe_adv_rx_desc {
         struct {