diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-01-19 19:43:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 17:33:50 -0500 |
commit | 288379f050284087578b77e04f040b57db3db3f8 (patch) | |
tree | ac5f5c83e2778a1966327d87316fc94067363b45 /drivers/net/mlx4/en_rx.c | |
parent | 627af770c63acddc2402dd19fec70df5c3ad8ab7 (diff) |
net: Remove redundant NAPI functions
Following the removal of the unused struct net_device * parameter from
the NAPI functions named *netif_rx_* in commit 908a7a1, they are
exactly equivalent to the corresponding *napi_* functions and are
therefore redundant.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mlx4/en_rx.c')
-rw-r--r-- | drivers/net/mlx4/en_rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c index c61b0bdca1a4..ac55ebd2f146 100644 --- a/drivers/net/mlx4/en_rx.c +++ b/drivers/net/mlx4/en_rx.c | |||
@@ -814,7 +814,7 @@ void mlx4_en_rx_irq(struct mlx4_cq *mcq) | |||
814 | struct mlx4_en_priv *priv = netdev_priv(cq->dev); | 814 | struct mlx4_en_priv *priv = netdev_priv(cq->dev); |
815 | 815 | ||
816 | if (priv->port_up) | 816 | if (priv->port_up) |
817 | netif_rx_schedule(&cq->napi); | 817 | napi_schedule(&cq->napi); |
818 | else | 818 | else |
819 | mlx4_en_arm_cq(priv, cq); | 819 | mlx4_en_arm_cq(priv, cq); |
820 | } | 820 | } |
@@ -834,7 +834,7 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget) | |||
834 | INC_PERF_COUNTER(priv->pstats.napi_quota); | 834 | INC_PERF_COUNTER(priv->pstats.napi_quota); |
835 | else { | 835 | else { |
836 | /* Done for now */ | 836 | /* Done for now */ |
837 | netif_rx_complete(napi); | 837 | napi_complete(napi); |
838 | mlx4_en_arm_cq(priv, cq); | 838 | mlx4_en_arm_cq(priv, cq); |
839 | } | 839 | } |
840 | return done; | 840 | return done; |