1 files changed, 46 insertions, 27 deletions

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 0cbf520cea77..fc895d0e85d9 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -814,7 +814,7 @@ vmxnet3_tq_init_all(struct vmxnet3_adapter *adapter)
 
 
 /*
- *    parse and copy relevant protocol headers:
+ *    parse relevant protocol headers:
  *      For a tso pkt, relevant headers are L2/3/4 including options
  *      For a pkt requesting csum offloading, they are L2/3 and may include L4
  *      if it's a TCP/UDP pkt
@@ -827,15 +827,14 @@ vmxnet3_tq_init_all(struct vmxnet3_adapter *adapter)
  * Other effects:
  *    1. related *ctx fields are updated.
  *    2. ctx->copy_size is # of bytes copied
- *    3. the portion copied is guaranteed to be in the linear part
+ *    3. the portion to be copied is guaranteed to be in the linear part
  *
  */
 static int
-vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
-                           struct vmxnet3_tx_ctx *ctx,
-                           struct vmxnet3_adapter *adapter)
+vmxnet3_parse_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
+                  struct vmxnet3_tx_ctx *ctx,
+                  struct vmxnet3_adapter *adapter)
 {
-        struct Vmxnet3_TxDataDesc *tdd;
         u8 protocol = 0;
 
         if (ctx->mss) { /* TSO */
@@ -892,16 +891,34 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                 return 0;
         }
 
+        return 1;
+err:
+        return -1;
+}
+
+/*
+ *    copy relevant protocol headers to the transmit ring:
+ *      For a tso pkt, relevant headers are L2/3/4 including options
+ *      For a pkt requesting csum offloading, they are L2/3 and may include L4
+ *      if it's a TCP/UDP pkt
+ *
+ *
+ *    Note that this requires that vmxnet3_parse_hdr be called first to set the
+ *      appropriate bits in ctx first
+ */
+static void
+vmxnet3_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
+                 struct vmxnet3_tx_ctx *ctx,
+                 struct vmxnet3_adapter *adapter)
+{
+        struct Vmxnet3_TxDataDesc *tdd;
+
         tdd = tq->data_ring.base + tq->tx_ring.next2fill;
 
         memcpy(tdd->data, skb->data, ctx->copy_size);
         netdev_dbg(adapter->netdev,
                 "copy %u bytes to dataRing[%u]\n",
                 ctx->copy_size, tq->tx_ring.next2fill);
-        return 1;
-
-err:
-        return -1;
 }
 
 
@@ -998,22 +1015,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                 }
         }
 
-        spin_lock_irqsave(&tq->tx_lock, flags);
-
-        if (count > vmxnet3_cmd_ring_desc_avail(&tq->tx_ring)) {
-                tq->stats.tx_ring_full++;
-                netdev_dbg(adapter->netdev,
-                        "tx queue stopped on %s, next2comp %u"
-                        " next2fill %u\n", adapter->netdev->name,
-                        tq->tx_ring.next2comp, tq->tx_ring.next2fill);
-
-                vmxnet3_tq_stop(tq, adapter);
-                spin_unlock_irqrestore(&tq->tx_lock, flags);
-                return NETDEV_TX_BUSY;
-        }
-
-
-        ret = vmxnet3_parse_and_copy_hdr(skb, tq, &ctx, adapter);
+        ret = vmxnet3_parse_hdr(skb, tq, &ctx, adapter);
         if (ret >= 0) {
                 BUG_ON(ret <= 0 && ctx.copy_size != 0);
                 /* hdrs parsed, check against other limits */
@@ -1033,9 +1035,26 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                 }
         } else {
                 tq->stats.drop_hdr_inspect_err++;
-                goto unlock_drop_pkt;
+                goto drop_pkt;
         }
 
+        spin_lock_irqsave(&tq->tx_lock, flags);
+
+        if (count > vmxnet3_cmd_ring_desc_avail(&tq->tx_ring)) {
+                tq->stats.tx_ring_full++;
+                netdev_dbg(adapter->netdev,
+                        "tx queue stopped on %s, next2comp %u"
+                        " next2fill %u\n", adapter->netdev->name,
+                        tq->tx_ring.next2comp, tq->tx_ring.next2fill);
+
+                vmxnet3_tq_stop(tq, adapter);
+                spin_unlock_irqrestore(&tq->tx_lock, flags);
+                return NETDEV_TX_BUSY;
+        }
+
+
+        vmxnet3_copy_hdr(skb, tq, &ctx, adapter);
+
         /* fill tx descs related to addr & len */
         if (vmxnet3_map_pkt(skb, &ctx, tq, adapter->pdev, adapter))
                 goto unlock_drop_pkt;