Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (54 commits)
  glge: remove unused #include <version.h>
  dnet: remove unused #include <version.h>
  tcp: miscounts due to tcp_fragment pcount reset
  tcp: add helper for counter tweaking due mid-wq change
  hso: fix for the 'invalid frame length' messages
  hso: fix for crash when unplugging the device
  fsl_pq_mdio: Fix compile failure
  fsl_pq_mdio: Revive UCC MDIO support
  ucc_geth: Pass proper device to DMA routines, otherwise oops happens
  i.MX31: Fixing cs89x0 network building to i.MX31ADS
  tc35815: Fix build error if NAPI enabled
  hso: add Vendor/Product ID's for new devices
  ucc_geth: Remove unused header
  gianfar: Remove unused header
  kaweth: Fix locking to be SMP-safe
  net: allow multiple dev per napi with GRO
  r8169: reset IntrStatus after chip reset
  ixgbe: Fix potential memory leak/driver panic issue while setting up Tx & Rx ring parameters
  ixgbe: fix ethtool -A|a behavior
  ixgbe: Patch to fix driver panic while freeing up tx & rx resources
  ...

7 files changed, 160 insertions, 101 deletions

diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index ed265a7a898f..de4db0dc7879 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -411,7 +411,8 @@ static s32 ixgbe_setup_fc_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
 
         /* Decide whether to use autoneg or not. */
         hw->mac.ops.check_link(hw, &speed, &link_up, false);
-        if (hw->phy.multispeed_fiber && (speed == IXGBE_LINK_SPEED_1GB_FULL))
+        if (!hw->fc.disable_fc_autoneg && hw->phy.multispeed_fiber &&
+            (speed == IXGBE_LINK_SPEED_1GB_FULL))
                 ret_val = ixgbe_fc_autoneg(hw);
 
         if (ret_val)
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index 8cfd3fd309a0..63ab6671d08e 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -1937,7 +1937,8 @@ s32 ixgbe_setup_fc_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
 
         /* Decide whether to use autoneg or not. */
         hw->mac.ops.check_link(hw, &speed, &link_up, false);
-        if (hw->phy.multispeed_fiber && (speed == IXGBE_LINK_SPEED_1GB_FULL))
+        if (!hw->fc.disable_fc_autoneg && hw->phy.multispeed_fiber &&
+            (speed == IXGBE_LINK_SPEED_1GB_FULL))
                 ret_val = ixgbe_fc_autoneg(hw);
 
         if (ret_val)
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h
index 7e94d6d399ab..24f73e719c3f 100644
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ixgbe/ixgbe_common.h
@@ -96,14 +96,11 @@ s32 ixgbe_write_analog_reg8_generic(struct ixgbe_hw *hw, u32 reg, u8 val);
 #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)
 
 #ifdef DEBUG
+extern char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw);
 #define hw_dbg(hw, format, arg...) \
-printk(KERN_DEBUG, "%s: " format, ixgbe_get_hw_dev_name(hw), ##arg);
+        printk(KERN_DEBUG "%s: " format, ixgbe_get_hw_dev_name(hw), ##arg)
 #else
-static inline int __attribute__ ((format (printf, 2, 3)))
-hw_dbg(struct ixgbe_hw *hw, const char *format, ...)
-{
-        return 0;
-}
+#define hw_dbg(hw, format, arg...) do {} while (0)
 #endif
 
 #endif /* IXGBE_COMMON */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index 0a8731f1f237..bd0a0c276952 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -90,6 +90,8 @@ int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
                         src_dcb_cfg->tc_config[i - DCB_PFC_UP_ATTR_0].dcb_pfc;
         }
 
+        dst_dcb_cfg->pfc_mode_enable = src_dcb_cfg->pfc_mode_enable;
+
         return 0;
 }
 
@@ -298,8 +300,10 @@ static void ixgbe_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority,
 
         adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc = setting;
         if (adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc !=
-            adapter->dcb_cfg.tc_config[priority].dcb_pfc)
+            adapter->dcb_cfg.tc_config[priority].dcb_pfc) {
                 adapter->dcb_set_bitmap |= BIT_PFC;
+                adapter->temp_dcb_cfg.pfc_mode_enable = true;
+        }
 }
 
 static void ixgbe_dcbnl_get_pfc_cfg(struct net_device *netdev, int priority,
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 18ecba7f6ecb..aafc120f164e 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -129,6 +129,15 @@ static int ixgbe_get_settings(struct net_device *netdev,
                         ecmd->advertising |= ADVERTISED_10000baseT_Full;
                 if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
                         ecmd->advertising |= ADVERTISED_1000baseT_Full;
+                /*
+                 * It's possible that phy.autoneg_advertised may not be
+                 * set yet.  If so display what the default would be -
+                 * both 1G and 10G supported.
+                 */
+                if (!(ecmd->advertising & (ADVERTISED_1000baseT_Full |
+                                           ADVERTISED_10000baseT_Full)))
+                        ecmd->advertising |= (ADVERTISED_10000baseT_Full |
+                                              ADVERTISED_1000baseT_Full);
 
                 ecmd->port = PORT_TP;
         } else if (hw->phy.media_type == ixgbe_media_type_backplane) {
@@ -225,7 +234,16 @@ static void ixgbe_get_pauseparam(struct net_device *netdev,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
 
-        pause->autoneg = (hw->fc.current_mode == ixgbe_fc_full ? 1 : 0);
+        /*
+         * Flow Control Autoneg isn't on if
+         *  - we didn't ask for it OR
+         *  - it failed, we know this by tx & rx being off
+         */
+        if (hw->fc.disable_fc_autoneg ||
+            (hw->fc.current_mode == ixgbe_fc_none))
+                pause->autoneg = 0;
+        else
+                pause->autoneg = 1;
 
         if (hw->fc.current_mode == ixgbe_fc_rx_pause) {
                 pause->rx_pause = 1;
@@ -243,8 +261,12 @@ static int ixgbe_set_pauseparam(struct net_device *netdev,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
 
-        if ((pause->autoneg == AUTONEG_ENABLE) ||
-            (pause->rx_pause && pause->tx_pause))
+        if (pause->autoneg != AUTONEG_ENABLE)
+                hw->fc.disable_fc_autoneg = true;
+        else
+                hw->fc.disable_fc_autoneg = false;
+
+        if (pause->rx_pause && pause->tx_pause)
                 hw->fc.requested_mode = ixgbe_fc_full;
         else if (pause->rx_pause && !pause->tx_pause)
                 hw->fc.requested_mode = ixgbe_fc_rx_pause;
@@ -712,9 +734,10 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
                                struct ethtool_ringparam *ring)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
-        struct ixgbe_ring *temp_ring;
+        struct ixgbe_ring *temp_tx_ring, *temp_rx_ring;
         int i, err;
         u32 new_rx_count, new_tx_count;
+        bool need_update = false;
 
         if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
                 return -EINVAL;
@@ -733,80 +756,94 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
                 return 0;
         }
 
-        temp_ring = kcalloc(adapter->num_tx_queues,
-                            sizeof(struct ixgbe_ring), GFP_KERNEL);
-        if (!temp_ring)
-                return -ENOMEM;
-
         while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
                 msleep(1);
 
-        if (new_tx_count != adapter->tx_ring->count) {
+        temp_tx_ring = kcalloc(adapter->num_tx_queues,
+                               sizeof(struct ixgbe_ring), GFP_KERNEL);
+        if (!temp_tx_ring) {
+                err = -ENOMEM;
+                goto err_setup;
+        }
+
+        if (new_tx_count != adapter->tx_ring_count) {
+                memcpy(temp_tx_ring, adapter->tx_ring,
+                       adapter->num_tx_queues * sizeof(struct ixgbe_ring));
                 for (i = 0; i < adapter->num_tx_queues; i++) {
-                        temp_ring[i].count = new_tx_count;
-                        err = ixgbe_setup_tx_resources(adapter, &temp_ring[i]);
+                        temp_tx_ring[i].count = new_tx_count;
+                        err = ixgbe_setup_tx_resources(adapter,
+                                                       &temp_tx_ring[i]);
                         if (err) {
                                 while (i) {
                                         i--;
                                         ixgbe_free_tx_resources(adapter,
-                                                                &temp_ring[i]);
+                                                                &temp_tx_ring[i]);
                                 }
                                 goto err_setup;
                         }
-                        temp_ring[i].v_idx = adapter->tx_ring[i].v_idx;
+                        temp_tx_ring[i].v_idx = adapter->tx_ring[i].v_idx;
                 }
-                if (netif_running(netdev))
-                        netdev->netdev_ops->ndo_stop(netdev);
-                ixgbe_reset_interrupt_capability(adapter);
-                ixgbe_napi_del_all(adapter);
-                INIT_LIST_HEAD(&netdev->napi_list);
-                kfree(adapter->tx_ring);
-                adapter->tx_ring = temp_ring;
-                temp_ring = NULL;
-                adapter->tx_ring_count = new_tx_count;
+                need_update = true;
         }
 
-        temp_ring = kcalloc(adapter->num_rx_queues,
-                            sizeof(struct ixgbe_ring), GFP_KERNEL);
-        if (!temp_ring) {
-                if (netif_running(netdev))
-                        netdev->netdev_ops->ndo_open(netdev);
-                return -ENOMEM;
+        temp_rx_ring = kcalloc(adapter->num_rx_queues,
+                               sizeof(struct ixgbe_ring), GFP_KERNEL);
+        if ((!temp_rx_ring) && (need_update)) {
+                for (i = 0; i < adapter->num_tx_queues; i++)
+                        ixgbe_free_tx_resources(adapter, &temp_tx_ring[i]);
+                kfree(temp_tx_ring);
+                err = -ENOMEM;
+                goto err_setup;
         }
 
-        if (new_rx_count != adapter->rx_ring->count) {
+        if (new_rx_count != adapter->rx_ring_count) {
+                memcpy(temp_rx_ring, adapter->rx_ring,
+                       adapter->num_rx_queues * sizeof(struct ixgbe_ring));
                 for (i = 0; i < adapter->num_rx_queues; i++) {
-                        temp_ring[i].count = new_rx_count;
-                        err = ixgbe_setup_rx_resources(adapter, &temp_ring[i]);
+                        temp_rx_ring[i].count = new_rx_count;
+                        err = ixgbe_setup_rx_resources(adapter,
+                                                       &temp_rx_ring[i]);
                         if (err) {
                                 while (i) {
                                         i--;
                                         ixgbe_free_rx_resources(adapter,
-                                                                &temp_ring[i]);
+                                                              &temp_rx_ring[i]);
                                 }
                                 goto err_setup;
                         }
-                        temp_ring[i].v_idx = adapter->rx_ring[i].v_idx;
+                        temp_rx_ring[i].v_idx = adapter->rx_ring[i].v_idx;
                 }
+                need_update = true;
+        }
+
+        /* if rings need to be updated, here's the place to do it in one shot */
+        if (need_update) {
                 if (netif_running(netdev))
-                        netdev->netdev_ops->ndo_stop(netdev);
-                ixgbe_reset_interrupt_capability(adapter);
-                ixgbe_napi_del_all(adapter);
-                INIT_LIST_HEAD(&netdev->napi_list);
-                kfree(adapter->rx_ring);
-                adapter->rx_ring = temp_ring;
-                temp_ring = NULL;
-
-                adapter->rx_ring_count = new_rx_count;
+                        ixgbe_down(adapter);
+
+                /* tx */
+                if (new_tx_count != adapter->tx_ring_count) {
+                        kfree(adapter->tx_ring);
+                        adapter->tx_ring = temp_tx_ring;
+                        temp_tx_ring = NULL;
+                        adapter->tx_ring_count = new_tx_count;
+                }
+
+                /* rx */
+                if (new_rx_count != adapter->rx_ring_count) {
+                        kfree(adapter->rx_ring);
+                        adapter->rx_ring = temp_rx_ring;
+                        temp_rx_ring = NULL;
+                        adapter->rx_ring_count = new_rx_count;
+                }
         }
 
         /* success! */
         err = 0;
-err_setup:
-        ixgbe_init_interrupt_scheme(adapter);
         if (netif_running(netdev))
-                netdev->netdev_ops->ndo_open(netdev);
+                ixgbe_up(adapter);
 
+err_setup:
         clear_bit(__IXGBE_RESETTING, &adapter->state);
         return err;
 }
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 79aa811c403c..286ecc0e6ab7 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -187,15 +187,14 @@ static void ixgbe_unmap_and_free_tx_resource(struct ixgbe_adapter *adapter,
                                              struct ixgbe_tx_buffer
                                              *tx_buffer_info)
 {
-        if (tx_buffer_info->dma) {
-                pci_unmap_page(adapter->pdev, tx_buffer_info->dma,
-                               tx_buffer_info->length, PCI_DMA_TODEVICE);
-                tx_buffer_info->dma = 0;
-        }
+        tx_buffer_info->dma = 0;
         if (tx_buffer_info->skb) {
+                skb_dma_unmap(&adapter->pdev->dev, tx_buffer_info->skb,
+                              DMA_TO_DEVICE);
                 dev_kfree_skb_any(tx_buffer_info->skb);
                 tx_buffer_info->skb = NULL;
         }
+        tx_buffer_info->time_stamp = 0;
         /* tx_buffer_info must be completely set up in the transmit path */
 }
 
@@ -204,15 +203,11 @@ static inline bool ixgbe_check_tx_hang(struct ixgbe_adapter *adapter,
                                        unsigned int eop)
 {
         struct ixgbe_hw *hw = &adapter->hw;
-        u32 head, tail;
 
         /* Detect a transmit hang in hardware, this serializes the
          * check with the clearing of time_stamp and movement of eop */
-        head = IXGBE_READ_REG(hw, tx_ring->head);
-        tail = IXGBE_READ_REG(hw, tx_ring->tail);
         adapter->detect_tx_hung = false;
-        if ((head != tail) &&
-            tx_ring->tx_buffer_info[eop].time_stamp &&
+        if (tx_ring->tx_buffer_info[eop].time_stamp &&
             time_after(jiffies, tx_ring->tx_buffer_info[eop].time_stamp + HZ) &&
             !(IXGBE_READ_REG(&adapter->hw, IXGBE_TFCS) & IXGBE_TFCS_TXOFF)) {
                 /* detected Tx unit hang */
@@ -227,7 +222,8 @@ static inline bool ixgbe_check_tx_hang(struct ixgbe_adapter *adapter,
                         "  time_stamp           <%lx>\n"
                         "  jiffies              <%lx>\n",
                         tx_ring->queue_index,
-                        head, tail,
+                        IXGBE_READ_REG(hw, tx_ring->head),
+                        IXGBE_READ_REG(hw, tx_ring->tail),
                         tx_ring->next_to_use, eop,
                         tx_ring->tx_buffer_info[eop].time_stamp, jiffies);
                 return true;
@@ -2934,6 +2930,7 @@ err_tx_ring_allocation:
  **/
 static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
 {
+        struct ixgbe_hw *hw = &adapter->hw;
         int err = 0;
         int vector, v_budget;
 
@@ -2948,12 +2945,12 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
 
         /*
          * At the same time, hardware can only support a maximum of
-         * MAX_MSIX_COUNT vectors.  With features such as RSS and VMDq,
-         * we can easily reach upwards of 64 Rx descriptor queues and
-         * 32 Tx queues.  Thus, we cap it off in those rare cases where
-         * the cpu count also exceeds our vector limit.
+         * hw.mac->max_msix_vectors vectors.  With features
+         * such as RSS and VMDq, we can easily surpass the number of Rx and Tx
+         * descriptor queues supported by our device.  Thus, we cap it off in
+         * those rare cases where the cpu count also exceeds our vector limit.
          */
-        v_budget = min(v_budget, MAX_MSIX_COUNT);
+        v_budget = min(v_budget, (int)hw->mac.max_msix_vectors);
 
         /* A failure in MSI-X entry allocation isn't fatal, but it does
          * mean we disable MSI-X capabilities of the adapter. */
@@ -3169,11 +3166,13 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
 #endif
 
         /* default flow control settings */
-        hw->fc.requested_mode = ixgbe_fc_none;
+        hw->fc.requested_mode = ixgbe_fc_full;
+        hw->fc.current_mode = ixgbe_fc_full;    /* init for ethtool output */
         hw->fc.high_water = IXGBE_DEFAULT_FCRTH;
         hw->fc.low_water = IXGBE_DEFAULT_FCRTL;
         hw->fc.pause_time = IXGBE_DEFAULT_FCPAUSE;
         hw->fc.send_xon = true;
+        hw->fc.disable_fc_autoneg = false;
 
         /* enable itr by default in dynamic mode */
         adapter->itr_setting = 1;
@@ -3489,10 +3488,10 @@ err_up:
         ixgbe_release_hw_control(adapter);
         ixgbe_free_irq(adapter);
 err_req_irq:
-        ixgbe_free_all_rx_resources(adapter);
 err_setup_rx:
-        ixgbe_free_all_tx_resources(adapter);
+        ixgbe_free_all_rx_resources(adapter);
 err_setup_tx:
+        ixgbe_free_all_tx_resources(adapter);
         ixgbe_reset(adapter);
 
         return err;
@@ -4163,32 +4162,39 @@ static int ixgbe_tx_map(struct ixgbe_adapter *adapter,
                         struct sk_buff *skb, unsigned int first)
 {
         struct ixgbe_tx_buffer *tx_buffer_info;
-        unsigned int len = skb->len;
+        unsigned int len = skb_headlen(skb);
         unsigned int offset = 0, size, count = 0, i;
         unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
         unsigned int f;
-
-        len -= skb->data_len;
+        dma_addr_t *map;
 
         i = tx_ring->next_to_use;
 
+        if (skb_dma_map(&adapter->pdev->dev, skb, DMA_TO_DEVICE)) {
+                dev_err(&adapter->pdev->dev, "TX DMA map failed\n");
+                return 0;
+        }
+
+        map = skb_shinfo(skb)->dma_maps;
+
         while (len) {
                 tx_buffer_info = &tx_ring->tx_buffer_info[i];
                 size = min(len, (uint)IXGBE_MAX_DATA_PER_TXD);
 
                 tx_buffer_info->length = size;
-                tx_buffer_info->dma = pci_map_single(adapter->pdev,
-                                                     skb->data + offset,
-                                                     size, PCI_DMA_TODEVICE);
+                tx_buffer_info->dma = map[0] + offset;
                 tx_buffer_info->time_stamp = jiffies;
                 tx_buffer_info->next_to_watch = i;
 
                 len -= size;
                 offset += size;
                 count++;
-                i++;
-                if (i == tx_ring->count)
-                        i = 0;
+
+                if (len) {
+                        i++;
+                        if (i == tx_ring->count)
+                                i = 0;
+                }
         }
 
         for (f = 0; f < nr_frags; f++) {
@@ -4196,33 +4202,27 @@ static int ixgbe_tx_map(struct ixgbe_adapter *adapter,
 
                 frag = &skb_shinfo(skb)->frags[f];
                 len = frag->size;
-                offset = frag->page_offset;
+                offset = 0;
 
                 while (len) {
+                        i++;
+                        if (i == tx_ring->count)
+                                i = 0;
+
                         tx_buffer_info = &tx_ring->tx_buffer_info[i];
                         size = min(len, (uint)IXGBE_MAX_DATA_PER_TXD);
 
                         tx_buffer_info->length = size;
-                        tx_buffer_info->dma = pci_map_page(adapter->pdev,
-                                                           frag->page,
-                                                           offset,
-                                                           size,
-                                                           PCI_DMA_TODEVICE);
+                        tx_buffer_info->dma = map[f + 1] + offset;
                         tx_buffer_info->time_stamp = jiffies;
                         tx_buffer_info->next_to_watch = i;
 
                         len -= size;
                         offset += size;
                         count++;
-                        i++;
-                        if (i == tx_ring->count)
-                                i = 0;
                 }
         }
-        if (i == 0)
-                i = tx_ring->count - 1;
-        else
-                i = i - 1;
+
         tx_ring->tx_buffer_info[i].skb = skb;
         tx_ring->tx_buffer_info[first].next_to_watch = i;
 
@@ -4388,13 +4388,19 @@ static int ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                  (skb->ip_summed == CHECKSUM_PARTIAL))
                 tx_flags |= IXGBE_TX_FLAGS_CSUM;
 
-        ixgbe_tx_queue(adapter, tx_ring, tx_flags,
-                       ixgbe_tx_map(adapter, tx_ring, skb, first),
-                       skb->len, hdr_len);
+        count = ixgbe_tx_map(adapter, tx_ring, skb, first);
 
-        netdev->trans_start = jiffies;
+        if (count) {
+                ixgbe_tx_queue(adapter, tx_ring, tx_flags, count, skb->len,
+                               hdr_len);
+                netdev->trans_start = jiffies;
+                ixgbe_maybe_stop_tx(netdev, tx_ring, DESC_NEEDED);
 
-        ixgbe_maybe_stop_tx(netdev, tx_ring, DESC_NEEDED);
+        } else {
+                dev_kfree_skb_any(skb);
+                tx_ring->tx_buffer_info[first].time_stamp = 0;
+                tx_ring->next_to_use = first;
+        }
 
         return NETDEV_TX_OK;
 }
@@ -4987,8 +4993,20 @@ static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
 
         return ret_val ? NOTIFY_BAD : NOTIFY_DONE;
 }
+
 #endif /* CONFIG_IXGBE_DCA */
+#ifdef DEBUG
+/**
+ * ixgbe_get_hw_dev_name - return device name string
+ * used by hardware layer to print debugging information
+ **/
+char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw)
+{
+        struct ixgbe_adapter *adapter = hw->back;
+        return adapter->netdev->name;
+}
 
+#endif
 module_exit(ixgbe_exit_module);
 
 /* ixgbe_main.c */
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index 2b2ecba7b609..030ff0a9ea67 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -2005,6 +2005,7 @@ struct ixgbe_fc_info {
         u16 pause_time; /* Flow Control Pause timer */
         bool send_xon; /* Flow control send XON */
         bool strict_ieee; /* Strict IEEE mode */
+        bool disable_fc_autoneg; /* Turn off autoneg FC mode */
         enum ixgbe_fc_mode current_mode; /* FC mode in effect */
         enum ixgbe_fc_mode requested_mode; /* FC mode requested by caller */
 };