diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/tehuti.c | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tehuti.c')
-rw-r--r-- | drivers/net/tehuti.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 5b83fbb02013..a10a83a11d9f 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -265,8 +265,8 @@ static irqreturn_t bdx_isr_napi(int irq, void *dev) | |||
265 | bdx_isr_extra(priv, isr); | 265 | bdx_isr_extra(priv, isr); |
266 | 266 | ||
267 | if (isr & (IR_RX_DESC_0 | IR_TX_FREE_0)) { | 267 | if (isr & (IR_RX_DESC_0 | IR_TX_FREE_0)) { |
268 | if (likely(netif_rx_schedule_prep(ndev, &priv->napi))) { | 268 | if (likely(netif_rx_schedule_prep(&priv->napi))) { |
269 | __netif_rx_schedule(ndev, &priv->napi); | 269 | __netif_rx_schedule(&priv->napi); |
270 | RET(IRQ_HANDLED); | 270 | RET(IRQ_HANDLED); |
271 | } else { | 271 | } else { |
272 | /* NOTE: we get here if intr has slipped into window | 272 | /* NOTE: we get here if intr has slipped into window |
@@ -289,7 +289,6 @@ static irqreturn_t bdx_isr_napi(int irq, void *dev) | |||
289 | static int bdx_poll(struct napi_struct *napi, int budget) | 289 | static int bdx_poll(struct napi_struct *napi, int budget) |
290 | { | 290 | { |
291 | struct bdx_priv *priv = container_of(napi, struct bdx_priv, napi); | 291 | struct bdx_priv *priv = container_of(napi, struct bdx_priv, napi); |
292 | struct net_device *dev = priv->ndev; | ||
293 | int work_done; | 292 | int work_done; |
294 | 293 | ||
295 | ENTER; | 294 | ENTER; |
@@ -303,7 +302,7 @@ static int bdx_poll(struct napi_struct *napi, int budget) | |||
303 | * device lock and allow waiting tasks (eg rmmod) to advance) */ | 302 | * device lock and allow waiting tasks (eg rmmod) to advance) */ |
304 | priv->napi_stop = 0; | 303 | priv->napi_stop = 0; |
305 | 304 | ||
306 | netif_rx_complete(dev, napi); | 305 | netif_rx_complete(napi); |
307 | bdx_enable_interrupts(priv); | 306 | bdx_enable_interrupts(priv); |
308 | } | 307 | } |
309 | return work_done; | 308 | return work_done; |