diff options
| author |   Tariq Toukan <tariqt@mellanox.com> | 2018-02-27 16:17:21 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-02-27 14:53:26 -0500 |
| commit | 1cb8b1216c427ddbec51b8c3e77459dd44f85bcc (patch) | |
| tree | 0fae59f1572351fb39b6e2fe9419e5693402d194 | |
| parent | net/mlx4_en: Remove unnecessary warn print in reset config (diff) | |
| download | linux-dev-1cb8b1216c427ddbec51b8c3e77459dd44f85bcc.tar.xz linux-dev-1cb8b1216c427ddbec51b8c3e77459dd44f85bcc.zip | |
net/mlx4_en: Combine checks of end-cases in RX completion function
Combine two end-cases in the same if statement with a single return value.
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_rx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index b4d144e67514..1e8f21b7fed8 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -662,12 +662,9 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud int polled = 0; int index; - if (unlikely(!priv->port_up)) + if (unlikely(!priv->port_up || budget <= 0)) return 0; - if (unlikely(budget <= 0)) - return polled; - ring = priv->rx_ring[cq_ring]; /* Protect accesses to: ring->xdp_prog, priv->mac_hash list */ |