1 files changed, 7 insertions, 22 deletions

diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c
index 5dc7466ad035..08c43f2ae72b 100644
--- a/drivers/net/mlx4/en_tx.c
+++ b/drivers/net/mlx4/en_tx.c
@@ -515,16 +515,9 @@ static int get_real_size(struct sk_buff *skb, struct net_device *dev,
                         else {
                                 if (netif_msg_tx_err(priv))
                                         en_warn(priv, "Non-linear headers\n");
-                                dev_kfree_skb_any(skb);
                                 return 0;
                         }
                 }
-                if (unlikely(*lso_header_size > MAX_LSO_HDR_SIZE)) {
-                        if (netif_msg_tx_err(priv))
-                                en_warn(priv, "LSO header size too big\n");
-                        dev_kfree_skb_any(skb);
-                        return 0;
-                }
         } else {
                 *lso_header_size = 0;
                 if (!is_inline(skb, NULL))
@@ -616,13 +609,9 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         int lso_header_size;
         void *fragptr;
 
-        if (unlikely(!skb->len)) {
-                dev_kfree_skb_any(skb);
-                return NETDEV_TX_OK;
-        }
         real_size = get_real_size(skb, dev, &lso_header_size);
         if (unlikely(!real_size))
-                return NETDEV_TX_OK;
+                goto tx_drop;
 
         /* Allign descriptor to TXBB size */
         desc_size = ALIGN(real_size, TXBB_SIZE);
@@ -630,8 +619,7 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         if (unlikely(nr_txbb > MAX_DESC_TXBBS)) {
                 if (netif_msg_tx_err(priv))
                         en_warn(priv, "Oversized header or SG list\n");
-                dev_kfree_skb_any(skb);
-                return NETDEV_TX_OK;
+                goto tx_drop;
         }
 
         tx_ind = skb->queue_mapping;
@@ -653,14 +641,6 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
                 return NETDEV_TX_BUSY;
         }
 
-        /* Now that we know what Tx ring to use */
-        if (unlikely(!priv->port_up)) {
-                if (netif_msg_tx_err(priv))
-                        en_warn(priv, "xmit: port down!\n");
-                dev_kfree_skb_any(skb);
-                return NETDEV_TX_OK;
-        }
-
         /* Track current inflight packets for performance analysis */
         AVG_PERF_COUNTER(priv->pstats.inflight_avg,
                          (u32) (ring->prod - ring->cons - 1));
@@ -785,5 +765,10 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         mlx4_en_xmit_poll(priv, tx_ind);
 
         return 0;
+
+tx_drop:
+        dev_kfree_skb_any(skb);
+        priv->stats.tx_dropped++;
+        return NETDEV_TX_OK;
 }