11 files changed, 253 insertions, 165 deletions

diff --git a/drivers/net/ixgb/Makefile b/drivers/net/ixgb/Makefile
index 7c7aff1ea7d..a8a2d3d0356 100644
--- a/drivers/net/ixgb/Makefile
+++ b/drivers/net/ixgb/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # 
-# Copyright(c) 1999 - 2002 Intel Corporation. All rights reserved.
+# Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it 
 # under the terms of the GNU General Public License as published by the Free 
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index c83271b3862..a83ef28dadb 100644
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
@@ -84,7 +84,12 @@ struct ixgb_adapter;
 #define IXGB_DBG(args...)
 #endif
 
-#define IXGB_ERR(args...) printk(KERN_ERR "ixgb: " args)
+#define PFX "ixgb: "
+#define DPRINTK(nlevel, klevel, fmt, args...) \
+        (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
+        printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \
+                __FUNCTION__ , ## args))
+
 
 /* TX/RX descriptor defines */
 #define DEFAULT_TXD      256
@@ -175,6 +180,7 @@ struct ixgb_adapter {
         uint64_t hw_csum_tx_good;
         uint64_t hw_csum_tx_error;
         uint32_t tx_int_delay;
+        uint32_t tx_timeout_count;
         boolean_t tx_int_delay_enable;
         boolean_t detect_tx_hung;
 
@@ -192,7 +198,9 @@ struct ixgb_adapter {
 
         /* structs defined in ixgb_hw.h */
         struct ixgb_hw hw;
+        u16 msg_enable;
         struct ixgb_hw_stats stats;
+        uint32_t alloc_rx_buff_failed;
 #ifdef CONFIG_PCI_MSI
         boolean_t have_msi;
 #endif
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c
index 661a46b95a6..8357c5590bf 100644
--- a/drivers/net/ixgb/ixgb_ee.c
+++ b/drivers/net/ixgb/ixgb_ee.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
diff --git a/drivers/net/ixgb/ixgb_ee.h b/drivers/net/ixgb/ixgb_ee.h
index 5190aa8761a..bf6fa220f38 100644
--- a/drivers/net/ixgb/ixgb_ee.h
+++ b/drivers/net/ixgb/ixgb_ee.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index d38ade5f2f4..cf19b898ba9 100644
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
@@ -44,6 +44,8 @@ extern void ixgb_free_rx_resources(struct ixgb_adapter *adapter);
 extern void ixgb_free_tx_resources(struct ixgb_adapter *adapter);
 extern void ixgb_update_stats(struct ixgb_adapter *adapter);
 
+#define IXGB_ALL_RAR_ENTRIES 16
+
 struct ixgb_stats {
         char stat_string[ETH_GSTRING_LEN];
         int sizeof_stat;
@@ -76,6 +78,7 @@ static struct ixgb_stats ixgb_gstrings_stats[] = {
         {"tx_heartbeat_errors", IXGB_STAT(net_stats.tx_heartbeat_errors)},
         {"tx_window_errors", IXGB_STAT(net_stats.tx_window_errors)},
         {"tx_deferred_ok", IXGB_STAT(stats.dc)},
+        {"tx_timeout_count", IXGB_STAT(tx_timeout_count) },
         {"rx_long_length_errors", IXGB_STAT(stats.roc)},
         {"rx_short_length_errors", IXGB_STAT(stats.ruc)},
 #ifdef NETIF_F_TSO
@@ -117,6 +120,16 @@ ixgb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
         return 0;
 }
 
+static void ixgb_set_speed_duplex(struct net_device *netdev)
+{
+        struct ixgb_adapter *adapter = netdev_priv(netdev);
+        /* be optimistic about our link, since we were up before */
+        adapter->link_speed = 10000;
+        adapter->link_duplex = FULL_DUPLEX;
+        netif_carrier_on(netdev);
+        netif_wake_queue(netdev);
+}
+
 static int
 ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 {
@@ -130,12 +143,7 @@ ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                 ixgb_down(adapter, TRUE);
                 ixgb_reset(adapter);
                 ixgb_up(adapter);
-                /* be optimistic about our link, since we were up before */
-                adapter->link_speed = 10000;
-                adapter->link_duplex = FULL_DUPLEX;
-                netif_carrier_on(netdev);
-                netif_wake_queue(netdev);
-                
+                ixgb_set_speed_duplex(netdev);
         } else
                 ixgb_reset(adapter);
 
@@ -183,11 +191,7 @@ ixgb_set_pauseparam(struct net_device *netdev,
         if(netif_running(adapter->netdev)) {
                 ixgb_down(adapter, TRUE);
                 ixgb_up(adapter);
-                /* be optimistic about our link, since we were up before */
-                adapter->link_speed = 10000;
-                adapter->link_duplex = FULL_DUPLEX;
-                netif_carrier_on(netdev);
-                netif_wake_queue(netdev);
+                ixgb_set_speed_duplex(netdev);
         } else
                 ixgb_reset(adapter);
                 
@@ -212,11 +216,7 @@ ixgb_set_rx_csum(struct net_device *netdev, uint32_t data)
         if(netif_running(netdev)) {
                 ixgb_down(adapter,TRUE);
                 ixgb_up(adapter);
-                /* be optimistic about our link, since we were up before */
-                adapter->link_speed = 10000;
-                adapter->link_duplex = FULL_DUPLEX;
-                netif_carrier_on(netdev);
-                netif_wake_queue(netdev);
+                ixgb_set_speed_duplex(netdev);
         } else
                 ixgb_reset(adapter);
         return 0;
@@ -251,6 +251,19 @@ ixgb_set_tso(struct net_device *netdev, uint32_t data)
 } 
 #endif /* NETIF_F_TSO */
 
+static uint32_t
+ixgb_get_msglevel(struct net_device *netdev)
+{
+        struct ixgb_adapter *adapter = netdev_priv(netdev);
+        return adapter->msg_enable;
+}
+
+static void
+ixgb_set_msglevel(struct net_device *netdev, uint32_t data)
+{
+        struct ixgb_adapter *adapter = netdev_priv(netdev);
+        adapter->msg_enable = data;
+}
 #define IXGB_GET_STAT(_A_, _R_) _A_->stats._R_
 
 static int 
@@ -303,7 +316,7 @@ ixgb_get_regs(struct net_device *netdev,
         *reg++ = IXGB_READ_REG(hw, RXCSUM);     /*  20 */
 
         /* there are 16 RAR entries in hardware, we only use 3 */
-        for(i = 0; i < 16; i++) {
+        for(i = 0; i < IXGB_ALL_RAR_ENTRIES; i++) {
                 *reg++ = IXGB_READ_REG_ARRAY(hw, RAL, (i << 1)); /*21,...,51 */
                 *reg++ = IXGB_READ_REG_ARRAY(hw, RAH, (i << 1)); /*22,...,52 */
         }
@@ -593,11 +606,7 @@ ixgb_set_ringparam(struct net_device *netdev,
                 adapter->tx_ring = tx_new;
                 if((err = ixgb_up(adapter)))
                         return err;
-                /* be optimistic about our link, since we were up before */
-                adapter->link_speed = 10000;
-                adapter->link_duplex = FULL_DUPLEX;
-                netif_carrier_on(netdev);
-                netif_wake_queue(netdev);
+                ixgb_set_speed_duplex(netdev);
         }
 
         return 0;
@@ -714,6 +723,8 @@ static struct ethtool_ops ixgb_ethtool_ops = {
         .set_tx_csum = ixgb_set_tx_csum,
         .get_sg = ethtool_op_get_sg,
         .set_sg = ethtool_op_set_sg,
+        .get_msglevel = ixgb_get_msglevel,
+        .set_msglevel = ixgb_set_msglevel,
 #ifdef NETIF_F_TSO
         .get_tso = ethtool_op_get_tso,
         .set_tso = ixgb_set_tso,
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index 620cad48bde..f7fa10e47fa 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h
index 382c6300ccc..cb4568915ad 100644
--- a/drivers/net/ixgb/ixgb_hw.h
+++ b/drivers/net/ixgb/ixgb_hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
@@ -57,6 +57,7 @@ typedef enum {
 typedef enum {
         ixgb_media_type_unknown = 0,
         ixgb_media_type_fiber = 1,
+        ixgb_media_type_copper = 2,
         ixgb_num_media_types
 } ixgb_media_type;
 
diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h
index aee207eaa28..40a085f94c7 100644
--- a/drivers/net/ixgb/ixgb_ids.h
+++ b/drivers/net/ixgb/ixgb_ids.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
@@ -43,6 +43,8 @@
 #define IXGB_SUBDEVICE_ID_A11F      0xA11F   
 #define IXGB_SUBDEVICE_ID_A01F      0xA01F   
 
-#endif /* #ifndef _IXGB_IDS_H_ */
+#define IXGB_DEVICE_ID_82597EX_CX4   0x109E
+#define IXGB_SUBDEVICE_ID_A00C  0xA00C
 
+#endif /* #ifndef _IXGB_IDS_H_ */
 /* End of File */
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index cfd67d812f0..57006fb8840 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
@@ -28,22 +28,6 @@
 
 #include "ixgb.h"
 
-/* Change Log
- * 1.0.96 04/19/05
- * - Make needlessly global code static -- bunk@stusta.de
- * - ethtool cleanup -- shemminger@osdl.org
- * - Support for MODULE_VERSION -- linville@tuxdriver.com
- * - add skb_header_cloned check to the tso path -- herbert@apana.org.au
- * 1.0.88 01/05/05
- * - include fix to the condition that determines when to quit NAPI - Robert Olsson
- * - use netif_poll_{disable/enable} to synchronize between NAPI and i/f up/down
- * 1.0.84 10/26/04
- * - reset buffer_info->dma in Tx resource cleanup logic
- * 1.0.83 10/12/04
- * - sparse cleanup - shemminger@osdl.org
- * - fix tx resource cleanup logic
- */
-
 char ixgb_driver_name[] = "ixgb";
 static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
 
@@ -52,9 +36,9 @@ static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
 #else
 #define DRIVERNAPI "-NAPI"
 #endif
-#define DRV_VERSION             "1.0.100-k2"DRIVERNAPI
+#define DRV_VERSION             "1.0.109-k2"DRIVERNAPI
 char ixgb_driver_version[] = DRV_VERSION;
-static char ixgb_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
+static char ixgb_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
 
 /* ixgb_pci_tbl - PCI Device ID Table
  *
@@ -67,6 +51,8 @@ static char ixgb_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
 static struct pci_device_id ixgb_pci_tbl[] = {
         {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR,  
@@ -148,6 +134,11 @@ MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
+#define DEFAULT_DEBUG_LEVEL_SHIFT 3
+static int debug = DEFAULT_DEBUG_LEVEL_SHIFT;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+
 /* some defines for controlling descriptor fetches in h/w */
 #define RXDCTL_WTHRESH_DEFAULT 16       /* chip writes back at this many or RXT0 */
 #define RXDCTL_PTHRESH_DEFAULT 0                /* chip considers prefech below
@@ -196,7 +187,7 @@ module_exit(ixgb_exit_module);
  * @adapter: board private structure
  **/
 
-static inline void
+static void
 ixgb_irq_disable(struct ixgb_adapter *adapter)
 {
         atomic_inc(&adapter->irq_sem);
@@ -210,7 +201,7 @@ ixgb_irq_disable(struct ixgb_adapter *adapter)
  * @adapter: board private structure
  **/
 
-static inline void
+static void
 ixgb_irq_enable(struct ixgb_adapter *adapter)
 {
         if(atomic_dec_and_test(&adapter->irq_sem)) {
@@ -231,6 +222,7 @@ ixgb_up(struct ixgb_adapter *adapter)
 
         /* hardware has been reset, we need to reload some things */
 
+        ixgb_rar_set(hw, netdev->dev_addr, 0);
         ixgb_set_multi(netdev);
 
         ixgb_restore_vlan(adapter);
@@ -240,6 +232,9 @@ ixgb_up(struct ixgb_adapter *adapter)
         ixgb_configure_rx(adapter);
         ixgb_alloc_rx_buffers(adapter);
 
+        /* disable interrupts and get the hardware into a known state */
+        IXGB_WRITE_REG(&adapter->hw, IMC, 0xffffffff);
+
 #ifdef CONFIG_PCI_MSI
         {
         boolean_t pcix = (IXGB_READ_REG(&adapter->hw, STATUS) & 
@@ -249,7 +244,7 @@ ixgb_up(struct ixgb_adapter *adapter)
         if (!pcix)
            adapter->have_msi = FALSE;
         else if((err = pci_enable_msi(adapter->pdev))) {
-                printk (KERN_ERR
+                DPRINTK(PROBE, ERR,
                  "Unable to allocate MSI interrupt Error: %d\n", err);
                 adapter->have_msi = FALSE;
                 /* proceed to try to request regular interrupt */
@@ -259,11 +254,11 @@ ixgb_up(struct ixgb_adapter *adapter)
 #endif
         if((err = request_irq(adapter->pdev->irq, &ixgb_intr,
                                   SA_SHIRQ | SA_SAMPLE_RANDOM,
-                                  netdev->name, netdev)))
+                                  netdev->name, netdev))) {
+                DPRINTK(PROBE, ERR,
+                 "Unable to allocate interrupt Error: %d\n", err);
                 return err;
-
-        /* disable interrupts and get the hardware into a known state */
-        IXGB_WRITE_REG(&adapter->hw, IMC, 0xffffffff);
+        }
 
         if((hw->max_frame_size != max_frame) ||
                 (hw->max_frame_size !=
@@ -285,11 +280,12 @@ ixgb_up(struct ixgb_adapter *adapter)
         }
 
         mod_timer(&adapter->watchdog_timer, jiffies);
-        ixgb_irq_enable(adapter);
 
 #ifdef CONFIG_IXGB_NAPI
         netif_poll_enable(netdev);
 #endif
+        ixgb_irq_enable(adapter);
+
         return 0;
 }
 
@@ -326,7 +322,7 @@ ixgb_reset(struct ixgb_adapter *adapter)
 
         ixgb_adapter_stop(&adapter->hw);
         if(!ixgb_init_hw(&adapter->hw))
-                IXGB_DBG("ixgb_init_hw failed.\n");
+                DPRINTK(PROBE, ERR, "ixgb_init_hw failed.\n");
 }
 
 /**
@@ -363,7 +359,8 @@ ixgb_probe(struct pci_dev *pdev,
         } else {
                 if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) ||
                    (err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))) {
-                        IXGB_ERR("No usable DMA configuration, aborting\n");
+                        printk(KERN_ERR
+                         "ixgb: No usable DMA configuration, aborting\n");
                         goto err_dma_mask;
                 }
                 pci_using_dac = 0;
@@ -388,6 +385,7 @@ ixgb_probe(struct pci_dev *pdev,
         adapter->netdev = netdev;
         adapter->pdev = pdev;
         adapter->hw.back = adapter;
+        adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);
 
         mmio_start = pci_resource_start(pdev, BAR_0);
         mmio_len = pci_resource_len(pdev, BAR_0);
@@ -416,7 +414,7 @@ ixgb_probe(struct pci_dev *pdev,
         netdev->change_mtu = &ixgb_change_mtu;
         ixgb_set_ethtool_ops(netdev);
         netdev->tx_timeout = &ixgb_tx_timeout;
-        netdev->watchdog_timeo = HZ;
+        netdev->watchdog_timeo = 5 * HZ;
 #ifdef CONFIG_IXGB_NAPI
         netdev->poll = &ixgb_clean;
         netdev->weight = 64;
@@ -428,6 +426,7 @@ ixgb_probe(struct pci_dev *pdev,
         netdev->poll_controller = ixgb_netpoll;
 #endif
 
+        strcpy(netdev->name, pci_name(pdev));
         netdev->mem_start = mmio_start;
         netdev->mem_end = mmio_start + mmio_len;
         netdev->base_addr = adapter->hw.io_base;
@@ -449,6 +448,9 @@ ixgb_probe(struct pci_dev *pdev,
 #ifdef NETIF_F_TSO
         netdev->features |= NETIF_F_TSO;
 #endif
+#ifdef NETIF_F_LLTX
+        netdev->features |= NETIF_F_LLTX;
+#endif
 
         if(pci_using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
@@ -456,7 +458,7 @@ ixgb_probe(struct pci_dev *pdev,
         /* make sure the EEPROM is good */
 
         if(!ixgb_validate_eeprom_checksum(&adapter->hw)) {
-                printk(KERN_ERR "The EEPROM Checksum Is Not Valid\n");
+                DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
                 err = -EIO;
                 goto err_eeprom;
         }
@@ -465,6 +467,7 @@ ixgb_probe(struct pci_dev *pdev,
         memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
 
         if(!is_valid_ether_addr(netdev->perm_addr)) {
+                DPRINTK(PROBE, ERR, "Invalid MAC Address\n");
                 err = -EIO;
                 goto err_eeprom;
         }
@@ -478,6 +481,7 @@ ixgb_probe(struct pci_dev *pdev,
         INIT_WORK(&adapter->tx_timeout_task,
                   (void (*)(void *))ixgb_tx_timeout_task, netdev);
 
+        strcpy(netdev->name, "eth%d");
         if((err = register_netdev(netdev)))
                 goto err_register;
 
@@ -486,8 +490,7 @@ ixgb_probe(struct pci_dev *pdev,
         netif_carrier_off(netdev);
         netif_stop_queue(netdev);
 
-        printk(KERN_INFO "%s: Intel(R) PRO/10GbE Network Connection\n",
-                   netdev->name);
+        DPRINTK(PROBE, INFO, "Intel(R) PRO/10GbE Network Connection\n");
         ixgb_check_options(adapter);
         /* reset the hardware with the new settings */
 
@@ -557,17 +560,17 @@ ixgb_sw_init(struct ixgb_adapter *adapter)
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_id = pdev->subsystem_device;
 
-        adapter->rx_buffer_len = IXGB_RXBUFFER_2048;
-
         hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
+        adapter->rx_buffer_len = hw->max_frame_size;
 
         if((hw->device_id == IXGB_DEVICE_ID_82597EX)
-           ||(hw->device_id == IXGB_DEVICE_ID_82597EX_LR)
-           ||(hw->device_id == IXGB_DEVICE_ID_82597EX_SR))
+           || (hw->device_id == IXGB_DEVICE_ID_82597EX_CX4)
+           || (hw->device_id == IXGB_DEVICE_ID_82597EX_LR)
+           || (hw->device_id == IXGB_DEVICE_ID_82597EX_SR))
                         hw->mac_type = ixgb_82597;
         else {
                 /* should never have loaded on this device */
-                printk(KERN_ERR "ixgb: unsupported device id\n");
+                DPRINTK(PROBE, ERR, "unsupported device id\n");
         }
 
         /* enable flow control to be programmed */
@@ -665,6 +668,8 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
         size = sizeof(struct ixgb_buffer) * txdr->count;
         txdr->buffer_info = vmalloc(size);
         if(!txdr->buffer_info) {
+                DPRINTK(PROBE, ERR,
+                 "Unable to allocate transmit descriptor ring memory\n");
                 return -ENOMEM;
         }
         memset(txdr->buffer_info, 0, size);
@@ -677,6 +682,8 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
         txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
         if(!txdr->desc) {
                 vfree(txdr->buffer_info);
+                DPRINTK(PROBE, ERR,
+                 "Unable to allocate transmit descriptor memory\n");
                 return -ENOMEM;
         }
         memset(txdr->desc, 0, txdr->size);
@@ -750,6 +757,8 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
         size = sizeof(struct ixgb_buffer) * rxdr->count;
         rxdr->buffer_info = vmalloc(size);
         if(!rxdr->buffer_info) {
+                DPRINTK(PROBE, ERR,
+                 "Unable to allocate receive descriptor ring\n");
                 return -ENOMEM;
         }
         memset(rxdr->buffer_info, 0, size);
@@ -763,6 +772,8 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
 
         if(!rxdr->desc) {
                 vfree(rxdr->buffer_info);
+                DPRINTK(PROBE, ERR,
+                 "Unable to allocate receive descriptors\n");
                 return -ENOMEM;
         }
         memset(rxdr->desc, 0, rxdr->size);
@@ -794,21 +805,14 @@ ixgb_setup_rctl(struct ixgb_adapter *adapter)
 
         rctl |= IXGB_RCTL_SECRC;
 
-        switch (adapter->rx_buffer_len) {
-        case IXGB_RXBUFFER_2048:
-        default:
+        if (adapter->rx_buffer_len <= IXGB_RXBUFFER_2048)
                 rctl |= IXGB_RCTL_BSIZE_2048;
-                break;
-        case IXGB_RXBUFFER_4096:
+        else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_4096)
                 rctl |= IXGB_RCTL_BSIZE_4096;
-                break;
-        case IXGB_RXBUFFER_8192:
+        else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_8192)
                 rctl |= IXGB_RCTL_BSIZE_8192;
-                break;
-        case IXGB_RXBUFFER_16384:
+        else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_16384)
                 rctl |= IXGB_RCTL_BSIZE_16384;
-                break;
-        }
 
         IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
 }
@@ -898,22 +902,25 @@ ixgb_free_tx_resources(struct ixgb_adapter *adapter)
         adapter->tx_ring.desc = NULL;
 }
 
-static inline void
+static void
 ixgb_unmap_and_free_tx_resource(struct ixgb_adapter *adapter,
                                         struct ixgb_buffer *buffer_info)
 {
         struct pci_dev *pdev = adapter->pdev;
-        if(buffer_info->dma) {
-                pci_unmap_page(pdev,
-                           buffer_info->dma,
-                           buffer_info->length,
-                           PCI_DMA_TODEVICE);
-                buffer_info->dma = 0;
-        }
-        if(buffer_info->skb) {
+
+        if (buffer_info->dma)
+                pci_unmap_page(pdev, buffer_info->dma, buffer_info->length,
+                               PCI_DMA_TODEVICE);
+
+        if (buffer_info->skb)
                 dev_kfree_skb_any(buffer_info->skb);
-                buffer_info->skb = NULL;
-        }
+
+        buffer_info->skb = NULL;
+        buffer_info->dma = 0;
+        buffer_info->time_stamp = 0;
+        /* these fields must always be initialized in tx
+         * buffer_info->length = 0;
+         * buffer_info->next_to_watch = 0; */
 }
 
 /**
@@ -1112,8 +1119,8 @@ ixgb_watchdog(unsigned long data)
 
         if(adapter->hw.link_up) {
                 if(!netif_carrier_ok(netdev)) {
-                        printk(KERN_INFO "ixgb: %s NIC Link is Up %d Mbps %s\n",
-                                   netdev->name, 10000, "Full Duplex");
+                        DPRINTK(LINK, INFO,
+                                "NIC Link is Up 10000 Mbps Full Duplex\n");
                         adapter->link_speed = 10000;
                         adapter->link_duplex = FULL_DUPLEX;
                         netif_carrier_on(netdev);
@@ -1123,9 +1130,7 @@ ixgb_watchdog(unsigned long data)
                 if(netif_carrier_ok(netdev)) {
                         adapter->link_speed = 0;
                         adapter->link_duplex = 0;
-                        printk(KERN_INFO
-                                   "ixgb: %s NIC Link is Down\n",
-                                   netdev->name);
+                        DPRINTK(LINK, INFO, "NIC Link is Down\n");
                         netif_carrier_off(netdev);
                         netif_stop_queue(netdev);
 
@@ -1158,7 +1163,7 @@ ixgb_watchdog(unsigned long data)
 #define IXGB_TX_FLAGS_VLAN              0x00000002
 #define IXGB_TX_FLAGS_TSO               0x00000004
 
-static inline int
+static int
 ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
 {
 #ifdef NETIF_F_TSO
@@ -1220,7 +1225,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
         return 0;
 }
 
-static inline boolean_t
+static boolean_t
 ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
 {
         struct ixgb_context_desc *context_desc;
@@ -1258,7 +1263,7 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
 #define IXGB_MAX_TXD_PWR        14
 #define IXGB_MAX_DATA_PER_TXD   (1<<IXGB_MAX_TXD_PWR)
 
-static inline int
+static int
 ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
             unsigned int first)
 {
@@ -1284,6 +1289,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
                                 size,
                                 PCI_DMA_TODEVICE);
                 buffer_info->time_stamp = jiffies;
+                buffer_info->next_to_watch = 0;
 
                 len -= size;
                 offset += size;
@@ -1309,6 +1315,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
                                         size,
                                         PCI_DMA_TODEVICE);
                         buffer_info->time_stamp = jiffies;
+                        buffer_info->next_to_watch = 0;
 
                         len -= size;
                         offset += size;
@@ -1323,7 +1330,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
         return count;
 }
 
-static inline void
+static void
 ixgb_tx_queue(struct ixgb_adapter *adapter, int count, int vlan_id,int tx_flags)
 {
         struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
@@ -1395,13 +1402,26 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 return 0;
         }
 
+#ifdef NETIF_F_LLTX
+        local_irq_save(flags);
+        if (!spin_trylock(&adapter->tx_lock)) {
+                /* Collision - tell upper layer to requeue */
+                local_irq_restore(flags);
+                return NETDEV_TX_LOCKED;
+        }
+#else
         spin_lock_irqsave(&adapter->tx_lock, flags);
+#endif
+
         if(unlikely(IXGB_DESC_UNUSED(&adapter->tx_ring) < DESC_NEEDED)) {
                 netif_stop_queue(netdev);
                 spin_unlock_irqrestore(&adapter->tx_lock, flags);
-                return 1;
+                return NETDEV_TX_BUSY;
         }
+
+#ifndef NETIF_F_LLTX
         spin_unlock_irqrestore(&adapter->tx_lock, flags);
+#endif
 
         if(adapter->vlgrp && vlan_tx_tag_present(skb)) {
                 tx_flags |= IXGB_TX_FLAGS_VLAN;
@@ -1413,10 +1433,13 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         tso = ixgb_tso(adapter, skb);
         if (tso < 0) {
                 dev_kfree_skb_any(skb);
+#ifdef NETIF_F_LLTX
+                spin_unlock_irqrestore(&adapter->tx_lock, flags);
+#endif
                 return NETDEV_TX_OK;
         }
 
-        if (tso)
+        if (likely(tso))
                 tx_flags |= IXGB_TX_FLAGS_TSO;
         else if(ixgb_tx_csum(adapter, skb))
                 tx_flags |= IXGB_TX_FLAGS_CSUM;
@@ -1426,7 +1449,15 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 
         netdev->trans_start = jiffies;
 
-        return 0;
+#ifdef NETIF_F_LLTX
+        /* Make sure there is space in the ring for the next send. */
+        if(unlikely(IXGB_DESC_UNUSED(&adapter->tx_ring) < DESC_NEEDED))
+                netif_stop_queue(netdev);
+
+        spin_unlock_irqrestore(&adapter->tx_lock, flags);
+
+#endif
+        return NETDEV_TX_OK;
 }
 
 /**
@@ -1448,6 +1479,7 @@ ixgb_tx_timeout_task(struct net_device *netdev)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
 
+        adapter->tx_timeout_count++;
         ixgb_down(adapter, TRUE);
         ixgb_up(adapter);
 }
@@ -1486,28 +1518,15 @@ ixgb_change_mtu(struct net_device *netdev, int new_mtu)
 
         if((max_frame < IXGB_MIN_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH)
            || (max_frame > IXGB_MAX_JUMBO_FRAME_SIZE + ENET_FCS_LENGTH)) {
-                IXGB_ERR("Invalid MTU setting\n");
+                DPRINTK(PROBE, ERR, "Invalid MTU setting %d\n", new_mtu);
                 return -EINVAL;
         }
 
-        if((max_frame <= IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH)
-           || (max_frame <= IXGB_RXBUFFER_2048)) {
-                adapter->rx_buffer_len = IXGB_RXBUFFER_2048;
-
-        } else if(max_frame <= IXGB_RXBUFFER_4096) {
-                adapter->rx_buffer_len = IXGB_RXBUFFER_4096;
-
-        } else if(max_frame <= IXGB_RXBUFFER_8192) {
-                adapter->rx_buffer_len = IXGB_RXBUFFER_8192;
-
-        } else {
-                adapter->rx_buffer_len = IXGB_RXBUFFER_16384;
-        }
+        adapter->rx_buffer_len = max_frame;
 
         netdev->mtu = new_mtu;
 
-        if(old_max_frame != max_frame && netif_running(netdev)) {
-
+        if ((old_max_frame != max_frame) && netif_running(netdev)) {
                 ixgb_down(adapter, TRUE);
                 ixgb_up(adapter);
         }
@@ -1765,23 +1784,43 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
 
         tx_ring->next_to_clean = i;
 
-        spin_lock(&adapter->tx_lock);
-        if(cleaned && netif_queue_stopped(netdev) && netif_carrier_ok(netdev) &&
-           (IXGB_DESC_UNUSED(tx_ring) > IXGB_TX_QUEUE_WAKE)) {
-
-                netif_wake_queue(netdev);
+        if (unlikely(netif_queue_stopped(netdev))) {
+                spin_lock(&adapter->tx_lock);
+                if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev) &&
+                    (IXGB_DESC_UNUSED(tx_ring) > IXGB_TX_QUEUE_WAKE))
+                        netif_wake_queue(netdev);
+                spin_unlock(&adapter->tx_lock);
         }
-        spin_unlock(&adapter->tx_lock);
 
         if(adapter->detect_tx_hung) {
                 /* detect a transmit hang in hardware, this serializes the
                  * check with the clearing of time_stamp and movement of i */
                 adapter->detect_tx_hung = FALSE;
-                if(tx_ring->buffer_info[i].dma &&
-                   time_after(jiffies, tx_ring->buffer_info[i].time_stamp + HZ)
+                if (tx_ring->buffer_info[eop].dma &&
+                   time_after(jiffies, tx_ring->buffer_info[eop].time_stamp + HZ)
                    && !(IXGB_READ_REG(&adapter->hw, STATUS) &
-                        IXGB_STATUS_TXOFF))
+                        IXGB_STATUS_TXOFF)) {
+                        /* detected Tx unit hang */
+                        DPRINTK(DRV, ERR, "Detected Tx Unit Hang\n"
+                                        "  TDH                  <%x>\n"
+                                        "  TDT                  <%x>\n"
+                                        "  next_to_use          <%x>\n"
+                                        "  next_to_clean        <%x>\n"
+                                        "buffer_info[next_to_clean]\n"
+                                        "  time_stamp           <%lx>\n"
+                                        "  next_to_watch        <%x>\n"
+                                        "  jiffies              <%lx>\n"
+                                        "  next_to_watch.status <%x>\n",
+                                IXGB_READ_REG(&adapter->hw, TDH),
+                                IXGB_READ_REG(&adapter->hw, TDT),
+                                tx_ring->next_to_use,
+                                tx_ring->next_to_clean,
+                                tx_ring->buffer_info[eop].time_stamp,
+                                eop,
+                                jiffies,
+                                eop_desc->status);
                         netif_stop_queue(netdev);
+                }
         }
 
         return cleaned;
@@ -1794,7 +1833,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
  * @sk_buff: socket buffer with received data
  **/
 
-static inline void
+static void
 ixgb_rx_checksum(struct ixgb_adapter *adapter,
                  struct ixgb_rx_desc *rx_desc,
                  struct sk_buff *skb)
@@ -1858,6 +1897,7 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
 #endif
                 status = rx_desc->status;
                 skb = buffer_info->skb;
+                buffer_info->skb = NULL;
 
                 prefetch(skb->data);
 
@@ -1902,6 +1942,26 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
                         goto rxdesc_done;
                 }
 
+                /* code added for copybreak, this should improve
+                 * performance for small packets with large amounts
+                 * of reassembly being done in the stack */
+#define IXGB_CB_LENGTH 256
+                if (length < IXGB_CB_LENGTH) {
+                        struct sk_buff *new_skb =
+                            dev_alloc_skb(length + NET_IP_ALIGN);
+                        if (new_skb) {
+                                skb_reserve(new_skb, NET_IP_ALIGN);
+                                new_skb->dev = netdev;
+                                memcpy(new_skb->data - NET_IP_ALIGN,
+                                       skb->data - NET_IP_ALIGN,
+                                       length + NET_IP_ALIGN);
+                                /* save the skb in buffer_info as good */
+                                buffer_info->skb = skb;
+                                skb = new_skb;
+                        }
+                }
+                /* end copybreak code */
+
                 /* Good Receive */
                 skb_put(skb, length);
 
@@ -1931,7 +1991,6 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
 rxdesc_done:
                 /* clean up descriptor, might be written over by hw */
                 rx_desc->status = 0;
-                buffer_info->skb = NULL;
 
                 /* use prefetched values */
                 rx_desc = next_rxd;
@@ -1971,12 +2030,18 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
 
         /* leave three descriptors unused */
         while(--cleancount > 2) {
-                rx_desc = IXGB_RX_DESC(*rx_ring, i);
-
-                skb = dev_alloc_skb(adapter->rx_buffer_len + NET_IP_ALIGN);
+                /* recycle! its good for you */
+                if (!(skb = buffer_info->skb))
+                        skb = dev_alloc_skb(adapter->rx_buffer_len
+                                            + NET_IP_ALIGN);
+                else {
+                        skb_trim(skb, 0);
+                        goto map_skb;
+                }
 
-                if(unlikely(!skb)) {
+                if (unlikely(!skb)) {
                         /* Better luck next round */
+                        adapter->alloc_rx_buff_failed++;
                         break;
                 }
 
@@ -1990,33 +2055,36 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
 
                 buffer_info->skb = skb;
                 buffer_info->length = adapter->rx_buffer_len;
-                buffer_info->dma =
-                        pci_map_single(pdev,
-                                   skb->data,
-                                   adapter->rx_buffer_len,
-                                   PCI_DMA_FROMDEVICE);
+map_skb:
+                buffer_info->dma = pci_map_single(pdev,
+                                                  skb->data,
+                                                  adapter->rx_buffer_len,
+                                                  PCI_DMA_FROMDEVICE);
 
+                rx_desc = IXGB_RX_DESC(*rx_ring, i);
                 rx_desc->buff_addr = cpu_to_le64(buffer_info->dma);
                 /* guarantee DD bit not set now before h/w gets descriptor
                  * this is the rest of the workaround for h/w double 
                  * writeback. */
                 rx_desc->status = 0;
 
-                if((i & ~(num_group_tail_writes- 1)) == i) {
-                        /* Force memory writes to complete before letting h/w
-                         * know there are new descriptors to fetch.  (Only
-                         * applicable for weak-ordered memory model archs,
-                         * such as IA-64). */
-                        wmb();
-
-                        IXGB_WRITE_REG(&adapter->hw, RDT, i);
-                }
 
                 if(++i == rx_ring->count) i = 0;
                 buffer_info = &rx_ring->buffer_info[i];
         }
 
-        rx_ring->next_to_use = i;
+        if (likely(rx_ring->next_to_use != i)) {
+                rx_ring->next_to_use = i;
+                if (unlikely(i-- == 0))
+                        i = (rx_ring->count - 1);
+
+                /* Force memory writes to complete before letting h/w
+                 * know there are new descriptors to fetch.  (Only
+                 * applicable for weak-ordered memory model archs, such
+                 * as IA-64). */
+                wmb();
+                IXGB_WRITE_REG(&adapter->hw, RDT, i);
+        }
 }
 
 /**
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
index dba20481ee8..ee982feac64 100644
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ixgb/ixgb_osdep.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
index 8a83dfdf746..39fbed29a3d 100644
--- a/drivers/net/ixgb/ixgb_param.c
+++ b/drivers/net/ixgb/ixgb_param.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
@@ -76,7 +76,7 @@ IXGB_PARAM(RxDescriptors, "Number of receive descriptors");
  *  - 2 - Tx only, generate PAUSE frames but ignore them on receive
  *  - 3 - Full Flow Control Support
  *
- * Default Value: Read flow control settings from the EEPROM
+ * Default Value: 2 - Tx only (silicon bug avoidance)
  */
 
 IXGB_PARAM(FlowControl, "Flow Control setting");
@@ -137,7 +137,7 @@ IXGB_PARAM(RxFCLowThresh, "Receive Flow Control Low Threshold");
  *
  * Valid Range: 1 - 65535 
  *
- * Default Value:  256 (0x100)
+ * Default Value:  65535 (0xffff) (we'll send an xon if we recover)
  */
 
 IXGB_PARAM(FCReqTimeout, "Flow Control Request Timeout");
@@ -165,8 +165,6 @@ IXGB_PARAM(IntDelayEnable, "Transmit Interrupt Delay Enable");
 
 #define XSUMRX_DEFAULT           OPTION_ENABLED
 
-#define FLOW_CONTROL_FULL          ixgb_fc_full
-#define FLOW_CONTROL_DEFAULT  FLOW_CONTROL_FULL
 #define DEFAULT_FCRTL                   0x28000
 #define DEFAULT_FCRTH                   0x30000
 #define MIN_FCRTL                             0
@@ -174,9 +172,9 @@ IXGB_PARAM(IntDelayEnable, "Transmit Interrupt Delay Enable");
 #define MIN_FCRTH                             8
 #define MAX_FCRTH                       0x3FFF0
 
-#define DEFAULT_FCPAUSE                 0x100   /* this may be too long */
 #define MIN_FCPAUSE                           1
 #define MAX_FCPAUSE                      0xffff
+#define DEFAULT_FCPAUSE                  0xFFFF /* this may be too long */
 
 struct ixgb_option {
         enum { enable_option, range_option, list_option } type;
@@ -336,7 +334,7 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                         .type = list_option,
                         .name = "Flow Control",
                         .err  = "reading default settings from EEPROM",
-                        .def  = ixgb_fc_full,
+                        .def  = ixgb_fc_tx_pause,
                         .arg  = { .l = { .nr = LIST_LEN(fc_list),
                                          .p = fc_list }}
                 };
@@ -365,8 +363,8 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                 } else {
                         adapter->hw.fc.high_water = opt.def;
                 }
-                if(!(adapter->hw.fc.type & ixgb_fc_rx_pause) )
-                        printk (KERN_INFO 
+                if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
+                        printk (KERN_INFO
                                 "Ignoring RxFCHighThresh when no RxFC\n");
         }
         { /* Receive Flow Control Low Threshold */
@@ -385,8 +383,8 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                 } else {
                         adapter->hw.fc.low_water = opt.def;
                 }
-                if(!(adapter->hw.fc.type & ixgb_fc_rx_pause) )
-                        printk (KERN_INFO 
+                if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
+                        printk (KERN_INFO
                                 "Ignoring RxFCLowThresh when no RxFC\n");
         }
         { /* Flow Control Pause Time Request*/
@@ -406,12 +404,12 @@ ixgb_check_options(struct ixgb_adapter *adapter)
                 } else {
                         adapter->hw.fc.pause_time = opt.def;
                 }
-                if(!(adapter->hw.fc.type & ixgb_fc_rx_pause) )
-                        printk (KERN_INFO 
+                if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) )
+                        printk (KERN_INFO
                                 "Ignoring FCReqTimeout when no RxFC\n");
         }
         /* high low and spacing check for rx flow control thresholds */
-        if (adapter->hw.fc.type & ixgb_fc_rx_pause) {
+        if (adapter->hw.fc.type & ixgb_fc_tx_pause) {
                 /* high must be greater than low */
                 if (adapter->hw.fc.high_water < (adapter->hw.fc.low_water + 8)) {
                         /* set defaults */