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/fs_enet | |
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/fs_enet')
-rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index ce900e54d8d1..b037ce9857bf 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -209,7 +209,7 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget) | |||
209 | 209 | ||
210 | if (received < budget) { | 210 | if (received < budget) { |
211 | /* done */ | 211 | /* done */ |
212 | netif_rx_complete(napi); | 212 | napi_complete(napi); |
213 | (*fep->ops->napi_enable_rx)(dev); | 213 | (*fep->ops->napi_enable_rx)(dev); |
214 | } | 214 | } |
215 | return received; | 215 | return received; |
@@ -478,7 +478,7 @@ fs_enet_interrupt(int irq, void *dev_id) | |||
478 | /* NOTE: it is possible for FCCs in NAPI mode */ | 478 | /* NOTE: it is possible for FCCs in NAPI mode */ |
479 | /* to submit a spurious interrupt while in poll */ | 479 | /* to submit a spurious interrupt while in poll */ |
480 | if (napi_ok) | 480 | if (napi_ok) |
481 | __netif_rx_schedule(&fep->napi); | 481 | __napi_schedule(&fep->napi); |
482 | } | 482 | } |
483 | } | 483 | } |
484 | 484 | ||