Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index d01a099475a1..121990cab144 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -56,7 +56,7 @@
 
 #define DRV_EXTRAVERSION "-k"
 
-#define DRV_VERSION "2.0.0" DRV_EXTRAVERSION
+#define DRV_VERSION "2.1.4" DRV_EXTRAVERSION
 char e1000e_driver_name[] = "e1000e";
 const char e1000e_driver_version[] = DRV_VERSION;
 
@@ -3446,7 +3446,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
 
                         /*
                          * if short on Rx space, Rx wins and must trump Tx
-                         * adjustment or use Early Receive if available
+                         * adjustment
                          */
                         if (pba < min_rx_space)
                                 pba = min_rx_space;
@@ -3755,6 +3755,10 @@ static irqreturn_t e1000_intr_msi_test(int irq, void *data)
         e_dbg("icr is %08X\n", icr);
         if (icr & E1000_ICR_RXSEQ) {
                 adapter->flags &= ~FLAG_MSI_TEST_FAILED;
+                /*
+                 * Force memory writes to complete before acknowledging the
+                 * interrupt is handled.
+                 */
                 wmb();
         }
 
@@ -3796,6 +3800,10 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
                 goto msi_test_failed;
         }
 
+        /*
+         * Force memory writes to complete before enabling and firing an
+         * interrupt.
+         */
         wmb();
 
         e1000_irq_enable(adapter);
@@ -3807,7 +3815,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
 
         e1000_irq_disable(adapter);
 
-        rmb();
+        rmb();                  /* read flags after interrupt has been fired */
 
         if (adapter->flags & FLAG_MSI_TEST_FAILED) {
                 adapter->int_mode = E1000E_INT_MODE_LEGACY;
@@ -4670,7 +4678,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
         struct e1000_buffer *buffer_info;
         unsigned int i;
         u32 cmd_length = 0;
-        u16 ipcse = 0, tucse, mss;
+        u16 ipcse = 0, mss;
         u8 ipcss, ipcso, tucss, tucso, hdr_len;
 
         if (!skb_is_gso(skb))
@@ -4704,7 +4712,6 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
         ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data;
         tucss = skb_transport_offset(skb);
         tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
-        tucse = 0;
 
         cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
                        E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
@@ -4718,7 +4725,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
         context_desc->lower_setup.ip_fields.ipcse  = cpu_to_le16(ipcse);
         context_desc->upper_setup.tcp_fields.tucss = tucss;
         context_desc->upper_setup.tcp_fields.tucso = tucso;
-        context_desc->upper_setup.tcp_fields.tucse = cpu_to_le16(tucse);
+        context_desc->upper_setup.tcp_fields.tucse = 0;
         context_desc->tcp_seg_setup.fields.mss     = cpu_to_le16(mss);
         context_desc->tcp_seg_setup.fields.hdr_len = hdr_len;
         context_desc->cmd_and_length = cpu_to_le32(cmd_length);