diff options
Diffstat (limited to 'drivers/net/arm')
-rw-r--r-- | drivers/net/arm/ep93xx_eth.c | 6 | ||||
-rw-r--r-- | drivers/net/arm/ixp4xx_eth.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index 588c9739d13d..6ecc600c1bcc 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c | |||
@@ -298,7 +298,7 @@ poll_some_more: | |||
298 | int more = 0; | 298 | int more = 0; |
299 | 299 | ||
300 | spin_lock_irq(&ep->rx_lock); | 300 | spin_lock_irq(&ep->rx_lock); |
301 | __netif_rx_complete(dev, napi); | 301 | __netif_rx_complete(napi); |
302 | wrl(ep, REG_INTEN, REG_INTEN_TX | REG_INTEN_RX); | 302 | wrl(ep, REG_INTEN, REG_INTEN_TX | REG_INTEN_RX); |
303 | if (ep93xx_have_more_rx(ep)) { | 303 | if (ep93xx_have_more_rx(ep)) { |
304 | wrl(ep, REG_INTEN, REG_INTEN_TX); | 304 | wrl(ep, REG_INTEN, REG_INTEN_TX); |
@@ -415,9 +415,9 @@ static irqreturn_t ep93xx_irq(int irq, void *dev_id) | |||
415 | 415 | ||
416 | if (status & REG_INTSTS_RX) { | 416 | if (status & REG_INTSTS_RX) { |
417 | spin_lock(&ep->rx_lock); | 417 | spin_lock(&ep->rx_lock); |
418 | if (likely(netif_rx_schedule_prep(dev, &ep->napi))) { | 418 | if (likely(netif_rx_schedule_prep(&ep->napi))) { |
419 | wrl(ep, REG_INTEN, REG_INTEN_TX); | 419 | wrl(ep, REG_INTEN, REG_INTEN_TX); |
420 | __netif_rx_schedule(dev, &ep->napi); | 420 | __netif_rx_schedule(&ep->napi); |
421 | } | 421 | } |
422 | spin_unlock(&ep->rx_lock); | 422 | spin_unlock(&ep->rx_lock); |
423 | } | 423 | } |
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 1c757b6781bb..26af411fc428 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
@@ -473,7 +473,7 @@ static void eth_rx_irq(void *pdev) | |||
473 | printk(KERN_DEBUG "%s: eth_rx_irq\n", dev->name); | 473 | printk(KERN_DEBUG "%s: eth_rx_irq\n", dev->name); |
474 | #endif | 474 | #endif |
475 | qmgr_disable_irq(port->plat->rxq); | 475 | qmgr_disable_irq(port->plat->rxq); |
476 | netif_rx_schedule(dev, &port->napi); | 476 | netif_rx_schedule(&port->napi); |
477 | } | 477 | } |
478 | 478 | ||
479 | static int eth_poll(struct napi_struct *napi, int budget) | 479 | static int eth_poll(struct napi_struct *napi, int budget) |
@@ -501,7 +501,7 @@ static int eth_poll(struct napi_struct *napi, int budget) | |||
501 | printk(KERN_DEBUG "%s: eth_poll netif_rx_complete\n", | 501 | printk(KERN_DEBUG "%s: eth_poll netif_rx_complete\n", |
502 | dev->name); | 502 | dev->name); |
503 | #endif | 503 | #endif |
504 | netif_rx_complete(dev, napi); | 504 | netif_rx_complete(napi); |
505 | qmgr_enable_irq(rxq); | 505 | qmgr_enable_irq(rxq); |
506 | if (!qmgr_stat_empty(rxq) && | 506 | if (!qmgr_stat_empty(rxq) && |
507 | netif_rx_reschedule(dev, napi)) { | 507 | netif_rx_reschedule(dev, napi)) { |
@@ -1036,7 +1036,7 @@ static int eth_open(struct net_device *dev) | |||
1036 | } | 1036 | } |
1037 | ports_open++; | 1037 | ports_open++; |
1038 | /* we may already have RX data, enables IRQ */ | 1038 | /* we may already have RX data, enables IRQ */ |
1039 | netif_rx_schedule(dev, &port->napi); | 1039 | netif_rx_schedule(&port->napi); |
1040 | return 0; | 1040 | return 0; |
1041 | } | 1041 | } |
1042 | 1042 | ||