5 files changed, 51 insertions, 109 deletions

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index f091042b146e..689f158a469e 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -59,17 +59,13 @@
 #include <linux/capability.h>
 #include <linux/in.h>
 #include <linux/ip.h>
-#ifdef NETIF_F_TSO6
 #include <linux/ipv6.h>
-#endif
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <net/pkt_sched.h>
 #include <linux/list.h>
 #include <linux/reboot.h>
-#ifdef NETIF_F_TSO
 #include <net/checksum.h>
-#endif
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
@@ -257,7 +253,6 @@ struct e1000_adapter {
         spinlock_t tx_queue_lock;
 #endif
         atomic_t irq_sem;
-        unsigned int detect_link;
         unsigned int total_tx_bytes;
         unsigned int total_tx_packets;
         unsigned int total_rx_bytes;
@@ -348,9 +343,7 @@ struct e1000_adapter {
         boolean_t have_msi;
 #endif
         /* to not mess up cache alignment, always add to the bottom */
-#ifdef NETIF_F_TSO
         boolean_t tso_force;
-#endif
         boolean_t smart_power_down;     /* phy smart power down */
         boolean_t quad_port_a;
         unsigned long flags;
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index fb96c87f9e56..44ebc72962dc 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -338,7 +338,6 @@ e1000_set_tx_csum(struct net_device *netdev, uint32_t data)
         return 0;
 }
 
-#ifdef NETIF_F_TSO
 static int
 e1000_set_tso(struct net_device *netdev, uint32_t data)
 {
@@ -352,18 +351,15 @@ e1000_set_tso(struct net_device *netdev, uint32_t data)
         else
                 netdev->features &= ~NETIF_F_TSO;
 
-#ifdef NETIF_F_TSO6
         if (data)
                 netdev->features |= NETIF_F_TSO6;
         else
                 netdev->features &= ~NETIF_F_TSO6;
-#endif
 
         DPRINTK(PROBE, INFO, "TSO is %s\n", data ? "Enabled" : "Disabled");
         adapter->tso_force = TRUE;
         return 0;
 }
-#endif /* NETIF_F_TSO */
 
 static uint32_t
 e1000_get_msglevel(struct net_device *netdev)
@@ -1971,10 +1967,8 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .set_tx_csum            = e1000_set_tx_csum,
         .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
-#ifdef NETIF_F_TSO
         .get_tso                = ethtool_op_get_tso,
         .set_tso                = e1000_set_tso,
-#endif
         .self_test_count        = e1000_diag_test_count,
         .self_test              = e1000_diag_test,
         .get_strings            = e1000_get_strings,
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 8424a8e4cbb0..619c89218b4b 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -36,7 +36,7 @@ static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
 #else
 #define DRIVERNAPI "-NAPI"
 #endif
-#define DRV_VERSION "7.3.15-k2"DRIVERNAPI
+#define DRV_VERSION "7.3.20-k2"DRIVERNAPI
 char e1000_driver_version[] = DRV_VERSION;
 static char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
 
@@ -990,16 +990,12 @@ e1000_probe(struct pci_dev *pdev,
                         netdev->features &= ~NETIF_F_HW_VLAN_FILTER;
         }
 
-#ifdef NETIF_F_TSO
         if ((adapter->hw.mac_type >= e1000_82544) &&
            (adapter->hw.mac_type != e1000_82547))
                 netdev->features |= NETIF_F_TSO;
 
-#ifdef NETIF_F_TSO6
         if (adapter->hw.mac_type > e1000_82547_rev_2)
                 netdev->features |= NETIF_F_TSO6;
-#endif
-#endif
         if (pci_using_dac)
                 netdev->features |= NETIF_F_HIGHDMA;
 
@@ -2583,15 +2579,22 @@ e1000_watchdog(unsigned long data)
 
         if (link) {
                 if (!netif_carrier_ok(netdev)) {
+                        uint32_t ctrl;
                         boolean_t txb2b = 1;
                         e1000_get_speed_and_duplex(&adapter->hw,
                                                    &adapter->link_speed,
                                                    &adapter->link_duplex);
 
-                        DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s\n",
-                               adapter->link_speed,
-                               adapter->link_duplex == FULL_DUPLEX ?
-                               "Full Duplex" : "Half Duplex");
+                        ctrl = E1000_READ_REG(&adapter->hw, CTRL);
+                        DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s, "
+                                "Flow Control: %s\n",
+                                adapter->link_speed,
+                                adapter->link_duplex == FULL_DUPLEX ?
+                                "Full Duplex" : "Half Duplex",
+                                ((ctrl & E1000_CTRL_TFCE) && (ctrl &
+                                E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl &
+                                E1000_CTRL_RFCE) ? "RX" : ((ctrl &
+                                E1000_CTRL_TFCE) ? "TX" : "None" )));
 
                         /* tweak tx_queue_len according to speed/duplex
                          * and adjust the timeout factor */
@@ -2619,7 +2622,6 @@ e1000_watchdog(unsigned long data)
                                 E1000_WRITE_REG(&adapter->hw, TARC0, tarc0);
                         }
 
-#ifdef NETIF_F_TSO
                         /* disable TSO for pcie and 10/100 speeds, to avoid
                          * some hardware issues */
                         if (!adapter->tso_force &&
@@ -2630,22 +2632,17 @@ e1000_watchdog(unsigned long data)
                                         DPRINTK(PROBE,INFO,
                                         "10/100 speed: disabling TSO\n");
                                         netdev->features &= ~NETIF_F_TSO;
-#ifdef NETIF_F_TSO6
                                         netdev->features &= ~NETIF_F_TSO6;
-#endif
                                         break;
                                 case SPEED_1000:
                                         netdev->features |= NETIF_F_TSO;
-#ifdef NETIF_F_TSO6
                                         netdev->features |= NETIF_F_TSO6;
-#endif
                                         break;
                                 default:
                                         /* oops */
                                         break;
                                 }
                         }
-#endif
 
                         /* enable transmits in the hardware, need to do this
                          * after setting TARC0 */
@@ -2875,7 +2872,6 @@ static int
 e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
           struct sk_buff *skb)
 {
-#ifdef NETIF_F_TSO
         struct e1000_context_desc *context_desc;
         struct e1000_buffer *buffer_info;
         unsigned int i;
@@ -2904,7 +2900,6 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                                                    0);
                         cmd_length = E1000_TXD_CMD_IP;
                         ipcse = skb->h.raw - skb->data - 1;
-#ifdef NETIF_F_TSO6
                 } else if (skb->protocol == htons(ETH_P_IPV6)) {
                         skb->nh.ipv6h->payload_len = 0;
                         skb->h.th->check =
@@ -2914,7 +2909,6 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                                                  IPPROTO_TCP,
                                                  0);
                         ipcse = 0;
-#endif
                 }
                 ipcss = skb->nh.raw - skb->data;
                 ipcso = (void *)&(skb->nh.iph->check) - (void *)skb->data;
@@ -2947,8 +2941,6 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 
                 return TRUE;
         }
-#endif
-
         return FALSE;
 }
 
@@ -2968,8 +2960,9 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                 buffer_info = &tx_ring->buffer_info[i];
                 context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
 
+                context_desc->lower_setup.ip_config = 0;
                 context_desc->upper_setup.tcp_fields.tucss = css;
-                context_desc->upper_setup.tcp_fields.tucso = css + skb->csum_offset;
+                context_desc->upper_setup.tcp_fields.tucso = css + skb->csum;
                 context_desc->upper_setup.tcp_fields.tucse = 0;
                 context_desc->tcp_seg_setup.data = 0;
                 context_desc->cmd_and_length = cpu_to_le32(E1000_TXD_CMD_DEXT);
@@ -3005,7 +2998,6 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
         while (len) {
                 buffer_info = &tx_ring->buffer_info[i];
                 size = min(len, max_per_txd);
-#ifdef NETIF_F_TSO
                 /* Workaround for Controller erratum --
                  * descriptor for non-tso packet in a linear SKB that follows a
                  * tso gets written back prematurely before the data is fully
@@ -3020,7 +3012,6 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                  * in TSO mode.  Append 4-byte sentinel desc */
                 if (unlikely(mss && !nr_frags && size == len && size > 8))
                         size -= 4;
-#endif
                 /* work-around for errata 10 and it applies
                  * to all controllers in PCI-X mode
                  * The fix is to make sure that the first descriptor of a
@@ -3062,12 +3053,10 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                 while (len) {
                         buffer_info = &tx_ring->buffer_info[i];
                         size = min(len, max_per_txd);
-#ifdef NETIF_F_TSO
                         /* Workaround for premature desc write-backs
                          * in TSO mode.  Append 4-byte sentinel desc */
                         if (unlikely(mss && f == (nr_frags-1) && size == len && size > 8))
                                 size -= 4;
-#endif
                         /* Workaround for potential 82544 hang in PCI-X.
                          * Avoid terminating buffers within evenly-aligned
                          * dwords. */
@@ -3292,7 +3281,6 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         if (adapter->hw.mac_type >= e1000_82571)
                 max_per_txd = 8192;
 
-#ifdef NETIF_F_TSO
         mss = skb_shinfo(skb)->gso_size;
         /* The controller does a simple calculation to
          * make sure there is enough room in the FIFO before
@@ -3346,16 +3334,10 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL))
                 count++;
         count++;
-#else
-        if (skb->ip_summed == CHECKSUM_PARTIAL)
-                count++;
-#endif
 
-#ifdef NETIF_F_TSO
         /* Controller Erratum workaround */
         if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))
                 count++;
-#endif
 
         count += TXD_USE_COUNT(len, max_txd_pwr);
 
@@ -3765,8 +3747,8 @@ e1000_update_stats(struct e1000_adapter *adapter)
  * @data: pointer to a network interface device structure
  **/
 
-static
-irqreturn_t e1000_intr_msi(int irq, void *data)
+static irqreturn_t
+e1000_intr_msi(int irq, void *data)
 {
         struct net_device *netdev = data;
         struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -3774,49 +3756,27 @@ irqreturn_t e1000_intr_msi(int irq, void *data)
 #ifndef CONFIG_E1000_NAPI
         int i;
 #endif
+        uint32_t icr = E1000_READ_REG(hw, ICR);
 
-        /* this code avoids the read of ICR but has to get 1000 interrupts
-         * at every link change event before it will notice the change */
-        if (++adapter->detect_link >= 1000) {
-                uint32_t icr = E1000_READ_REG(hw, ICR);
 #ifdef CONFIG_E1000_NAPI
-                /* read ICR disables interrupts using IAM, so keep up with our
-                 * enable/disable accounting */
-                atomic_inc(&adapter->irq_sem);
+        /* read ICR disables interrupts using IAM, so keep up with our
+         * enable/disable accounting */
+        atomic_inc(&adapter->irq_sem);
 #endif
-                adapter->detect_link = 0;
-                if ((icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) &&
-                    (icr & E1000_ICR_INT_ASSERTED)) {
-                        hw->get_link_status = 1;
-                        /* 80003ES2LAN workaround--
-                        * For packet buffer work-around on link down event;
-                        * disable receives here in the ISR and
-                        * reset adapter in watchdog
-                        */
-                        if (netif_carrier_ok(netdev) &&
-                            (adapter->hw.mac_type == e1000_80003es2lan)) {
-                                /* disable receives */
-                                uint32_t rctl = E1000_READ_REG(hw, RCTL);
-                                E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
-                        }
-                        /* guard against interrupt when we're going down */
-                        if (!test_bit(__E1000_DOWN, &adapter->flags))
-                                mod_timer(&adapter->watchdog_timer,
-                                          jiffies + 1);
+        if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
+                hw->get_link_status = 1;
+                /* 80003ES2LAN workaround-- For packet buffer work-around on
+                 * link down event; disable receives here in the ISR and reset
+                 * adapter in watchdog */
+                if (netif_carrier_ok(netdev) &&
+                    (adapter->hw.mac_type == e1000_80003es2lan)) {
+                        /* disable receives */
+                        uint32_t rctl = E1000_READ_REG(hw, RCTL);
+                        E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
                 }
-        } else {
-                E1000_WRITE_REG(hw, ICR, (0xffffffff & ~(E1000_ICR_RXSEQ |
-                                                         E1000_ICR_LSC)));
-                /* bummer we have to flush here, but things break otherwise as
-                 * some event appears to be lost or delayed and throughput
-                 * drops.  In almost all tests this flush is un-necessary */
-                E1000_WRITE_FLUSH(hw);
-#ifdef CONFIG_E1000_NAPI
-                /* Interrupt Auto-Mask (IAM)...upon writing ICR, interrupts are
-                 * masked.  No need for the IMC write, but it does mean we
-                 * should account for it ASAP. */
-                atomic_inc(&adapter->irq_sem);
-#endif
+                /* guard against interrupt when we're going down */
+                if (!test_bit(__E1000_DOWN, &adapter->flags))
+                        mod_timer(&adapter->watchdog_timer, jiffies + 1);
         }
 
 #ifdef CONFIG_E1000_NAPI
@@ -3836,7 +3796,7 @@ irqreturn_t e1000_intr_msi(int irq, void *data)
 
         for (i = 0; i < E1000_MAX_INTR; i++)
                 if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
-                   !e1000_clean_tx_irq(adapter, adapter->tx_ring)))
+                   e1000_clean_tx_irq(adapter, adapter->tx_ring)))
                         break;
 
         if (likely(adapter->itr_setting & 3))
@@ -3939,7 +3899,7 @@ e1000_intr(int irq, void *data)
 
         for (i = 0; i < E1000_MAX_INTR; i++)
                 if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
-                   !e1000_clean_tx_irq(adapter, adapter->tx_ring)))
+                   e1000_clean_tx_irq(adapter, adapter->tx_ring)))
                         break;
 
         if (likely(adapter->itr_setting & 3))
@@ -3989,7 +3949,7 @@ e1000_clean(struct net_device *poll_dev, int *budget)
         poll_dev->quota -= work_done;
 
         /* If no Tx and not enough Rx work done, exit the polling mode */
-        if ((!tx_cleaned && (work_done == 0)) ||
+        if ((tx_cleaned && (work_done < work_to_do)) ||
            !netif_running(poll_dev)) {
 quit_polling:
                 if (likely(adapter->itr_setting & 3))
@@ -4019,7 +3979,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 #ifdef CONFIG_E1000_NAPI
         unsigned int count = 0;
 #endif
-        boolean_t cleaned = FALSE;
+        boolean_t cleaned = TRUE;
         unsigned int total_tx_bytes=0, total_tx_packets=0;
 
         i = tx_ring->next_to_clean;
@@ -4034,10 +3994,13 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 
                         if (cleaned) {
                                 struct sk_buff *skb = buffer_info->skb;
-                                unsigned int segs = skb_shinfo(skb)->gso_segs;
+                                unsigned int segs, bytecount;
+                                segs = skb_shinfo(skb)->gso_segs ?: 1;
+                                /* multiply data chunks by size of headers */
+                                bytecount = ((segs - 1) * skb_headlen(skb)) +
+                                            skb->len;
                                 total_tx_packets += segs;
-                                total_tx_packets++;
-                                total_tx_bytes += skb->len;
+                                total_tx_bytes += bytecount;
                         }
                         e1000_unmap_and_free_tx_resource(adapter, buffer_info);
                         tx_desc->upper.data = 0;
@@ -4050,7 +4013,10 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 #ifdef CONFIG_E1000_NAPI
 #define E1000_TX_WEIGHT 64
                 /* weight of a sort for tx, to avoid endless transmit cleanup */
-                if (count++ == E1000_TX_WEIGHT) break;
+                if (count++ == E1000_TX_WEIGHT) {
+                        cleaned = FALSE;
+                        break;
+                }
 #endif
         }
 
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h
index 18afc0c25dac..10af742d8a20 100644
--- a/drivers/net/e1000/e1000_osdep.h
+++ b/drivers/net/e1000/e1000_osdep.h
@@ -48,8 +48,6 @@ typedef enum {
     TRUE = 1
 } boolean_t;
 
-#define MSGOUT(S, A, B) printk(KERN_DEBUG S "\n", A, B)
-
 #ifdef DBG
 #define DEBUGOUT(S)             printk(KERN_DEBUG S "\n")
 #define DEBUGOUT1(S, A...)      printk(KERN_DEBUG S "\n", A)
@@ -58,7 +56,7 @@ typedef enum {
 #define DEBUGOUT1(S, A...)
 #endif
 
-#define DEBUGFUNC(F) DEBUGOUT(F)
+#define DEBUGFUNC(F) DEBUGOUT(F "\n")
 #define DEBUGOUT2 DEBUGOUT1
 #define DEBUGOUT3 DEBUGOUT2
 #define DEBUGOUT7 DEBUGOUT3
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index cf2a279307e1..f8862e203ac9 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -760,22 +760,13 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
         case SPEED_1000:
                 DPRINTK(PROBE, INFO, "1000 Mbps Speed specified without "
                         "Duplex\n");
-                DPRINTK(PROBE, INFO,
-                        "Using Autonegotiation at 1000 Mbps "
-                        "Full Duplex only\n");
-                adapter->hw.autoneg = adapter->fc_autoneg = 1;
-                adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
-                break;
+                goto full_duplex_only;
         case SPEED_1000 + HALF_DUPLEX:
                 DPRINTK(PROBE, INFO,
                         "Half Duplex is not supported at 1000 Mbps\n");
-                DPRINTK(PROBE, INFO,
-                        "Using Autonegotiation at 1000 Mbps "
-                        "Full Duplex only\n");
-                adapter->hw.autoneg = adapter->fc_autoneg = 1;
-                adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
-                break;
+                /* fall through */
         case SPEED_1000 + FULL_DUPLEX:
+full_duplex_only:
                 DPRINTK(PROBE, INFO,
                        "Using Autonegotiation at 1000 Mbps Full Duplex only\n");
                 adapter->hw.autoneg = adapter->fc_autoneg = 1;