aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAchiad Shochat <achiad@mellanox.com>2015-06-23 17:14:17 +0300
committerDavid S. Miller <davem@davemloft.net>2015-06-24 00:42:37 -0700
commit9fc5930625bcf7c519db84023ec720e7f2f7f61c (patch)
tree5470c95f281bf95052a5babe2b560a83577c8606 /drivers
parentnet/mlx5e: Remove re-assignment of wq type in mlx5e_enable_rq() (diff)
downloadlinux-dev-9fc5930625bcf7c519db84023ec720e7f2f7f61c.tar.xz
linux-dev-9fc5930625bcf7c519db84023ec720e7f2f7f61c.zip
net/mlx5e: Avoid redundant dev_kfree_skb() upon NOP completion
NOP completion SKBs are always NULL. Signed-off-by: Achiad Shochat <achiad@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/en_tx.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
index c0566b684778..f5c7d78c64f7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -294,7 +294,7 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq)
if (unlikely(!skb)) { /* nop */
sq->stats.nop++;
sqcc++;
- goto free_skb;
+ continue;
}
for (j = 0; j < MLX5E_TX_SKB_CB(skb)->num_dma; j++) {
@@ -309,8 +309,6 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq)
npkts++;
nbytes += MLX5E_TX_SKB_CB(skb)->num_bytes;
sqcc += MLX5E_TX_SKB_CB(skb)->num_wqebbs;
-
-free_skb:
dev_kfree_skb(skb);
}