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/8139too.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/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index a5b24202d564..5341da604e84 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -2128,7 +2128,7 @@ static int rtl8139_poll(struct napi_struct *napi, int budget) | |||
2128 | */ | 2128 | */ |
2129 | spin_lock_irqsave(&tp->lock, flags); | 2129 | spin_lock_irqsave(&tp->lock, flags); |
2130 | RTL_W16_F(IntrMask, rtl8139_intr_mask); | 2130 | RTL_W16_F(IntrMask, rtl8139_intr_mask); |
2131 | __netif_rx_complete(napi); | 2131 | __napi_complete(napi); |
2132 | spin_unlock_irqrestore(&tp->lock, flags); | 2132 | spin_unlock_irqrestore(&tp->lock, flags); |
2133 | } | 2133 | } |
2134 | spin_unlock(&tp->rx_lock); | 2134 | spin_unlock(&tp->rx_lock); |
@@ -2178,9 +2178,9 @@ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance) | |||
2178 | /* Receive packets are processed by poll routine. | 2178 | /* Receive packets are processed by poll routine. |
2179 | If not running start it now. */ | 2179 | If not running start it now. */ |
2180 | if (status & RxAckBits){ | 2180 | if (status & RxAckBits){ |
2181 | if (netif_rx_schedule_prep(&tp->napi)) { | 2181 | if (napi_schedule_prep(&tp->napi)) { |
2182 | RTL_W16_F (IntrMask, rtl8139_norx_intr_mask); | 2182 | RTL_W16_F (IntrMask, rtl8139_norx_intr_mask); |
2183 | __netif_rx_schedule(&tp->napi); | 2183 | __napi_schedule(&tp->napi); |
2184 | } | 2184 | } |
2185 | } | 2185 | } |
2186 | 2186 | ||