diff options
| author | Jesper Dangaard Brouer | 2016-09-19 17:46:38 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-09-20 10:58:17 +0200 |
| commit | 5737f6c92681939e417579b421f81f035e57c582 (patch) | |
| tree | 52f9c4f03ecfbc9a84fef11cde79a38fcb802f0e /drivers/net/ethernet/mellanox/mlx4/en_rx.c | |
| parent | Merge branch 'dsa-set_addr-optional' (diff) | |
| download | kernel-qcow2-linux-5737f6c92681939e417579b421f81f035e57c582.tar.gz kernel-qcow2-linux-5737f6c92681939e417579b421f81f035e57c582.tar.xz kernel-qcow2-linux-5737f6c92681939e417579b421f81f035e57c582.zip | |
mlx4: add missed recycle opportunity for XDP_TX on TX failure
Correct drop handling for XDP_TX on TX failure, were recently added in
commit 95357907ae73 ("mlx4: fix XDP_TX is acting like XDP_PASS on TX
ring full").
The change missed an opportunity for recycling the RX page, instead of
going through the page allocator, like the regular XDP_DROP action does.
This patch cease the opportunity, by going through the XDP_DROP case.
Fixes: 95357907ae73 ("mlx4: fix XDP_TX is acting like XDP_PASS on TX ring full")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/en_rx.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index c80073e4947f..c46355bce613 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -906,11 +906,12 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud length, tx_index, &doorbell_pending)) goto consumed; - goto next; /* Drop on xmit failure */ + goto xdp_drop; /* Drop on xmit failure */ default: bpf_warn_invalid_xdp_action(act); case XDP_ABORTED: case XDP_DROP: +xdp_drop: if (mlx4_en_rx_recycle(ring, frags)) goto consumed; goto next; |