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/chelsio/sge.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/chelsio/sge.c')
-rw-r--r-- | drivers/net/chelsio/sge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c index d984b7995763..840da83fb3cf 100644 --- a/drivers/net/chelsio/sge.c +++ b/drivers/net/chelsio/sge.c | |||
@@ -1612,7 +1612,7 @@ int t1_poll(struct napi_struct *napi, int budget) | |||
1612 | int work_done = process_responses(adapter, budget); | 1612 | int work_done = process_responses(adapter, budget); |
1613 | 1613 | ||
1614 | if (likely(work_done < budget)) { | 1614 | if (likely(work_done < budget)) { |
1615 | netif_rx_complete(napi); | 1615 | napi_complete(napi); |
1616 | writel(adapter->sge->respQ.cidx, | 1616 | writel(adapter->sge->respQ.cidx, |
1617 | adapter->regs + A_SG_SLEEPING); | 1617 | adapter->regs + A_SG_SLEEPING); |
1618 | } | 1618 | } |
@@ -1630,7 +1630,7 @@ irqreturn_t t1_interrupt(int irq, void *data) | |||
1630 | 1630 | ||
1631 | if (napi_schedule_prep(&adapter->napi)) { | 1631 | if (napi_schedule_prep(&adapter->napi)) { |
1632 | if (process_pure_responses(adapter)) | 1632 | if (process_pure_responses(adapter)) |
1633 | __netif_rx_schedule(&adapter->napi); | 1633 | __napi_schedule(&adapter->napi); |
1634 | else { | 1634 | else { |
1635 | /* no data, no NAPI needed */ | 1635 | /* no data, no NAPI needed */ |
1636 | writel(sge->respQ.cidx, adapter->regs + A_SG_SLEEPING); | 1636 | writel(sge->respQ.cidx, adapter->regs + A_SG_SLEEPING); |