diff options
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/hd64572.c | 4 | ||||
-rw-r--r-- | drivers/net/wan/ixp4xx_hss.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c index 08b3536944fe..497b003d7239 100644 --- a/drivers/net/wan/hd64572.c +++ b/drivers/net/wan/hd64572.c | |||
@@ -341,7 +341,7 @@ static int sca_poll(struct napi_struct *napi, int budget) | |||
341 | received = sca_rx_done(port, budget); | 341 | received = sca_rx_done(port, budget); |
342 | 342 | ||
343 | if (received < budget) { | 343 | if (received < budget) { |
344 | netif_rx_complete(napi); | 344 | napi_complete(napi); |
345 | enable_intr(port); | 345 | enable_intr(port); |
346 | } | 346 | } |
347 | 347 | ||
@@ -359,7 +359,7 @@ static irqreturn_t sca_intr(int irq, void *dev_id) | |||
359 | if (port && (isr0 & (i ? 0x08002200 : 0x00080022))) { | 359 | if (port && (isr0 & (i ? 0x08002200 : 0x00080022))) { |
360 | handled = 1; | 360 | handled = 1; |
361 | disable_intr(port); | 361 | disable_intr(port); |
362 | netif_rx_schedule(&port->napi); | 362 | napi_schedule(&port->napi); |
363 | } | 363 | } |
364 | } | 364 | } |
365 | 365 | ||
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index 7e8bbba2cc1b..3bf7d3f447db 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c | |||
@@ -622,7 +622,7 @@ static void hss_hdlc_rx_irq(void *pdev) | |||
622 | printk(KERN_DEBUG "%s: hss_hdlc_rx_irq\n", dev->name); | 622 | printk(KERN_DEBUG "%s: hss_hdlc_rx_irq\n", dev->name); |
623 | #endif | 623 | #endif |
624 | qmgr_disable_irq(queue_ids[port->id].rx); | 624 | qmgr_disable_irq(queue_ids[port->id].rx); |
625 | netif_rx_schedule(&port->napi); | 625 | napi_schedule(&port->napi); |
626 | } | 626 | } |
627 | 627 | ||
628 | static int hss_hdlc_poll(struct napi_struct *napi, int budget) | 628 | static int hss_hdlc_poll(struct napi_struct *napi, int budget) |
@@ -649,15 +649,15 @@ static int hss_hdlc_poll(struct napi_struct *napi, int budget) | |||
649 | if ((n = queue_get_desc(rxq, port, 0)) < 0) { | 649 | if ((n = queue_get_desc(rxq, port, 0)) < 0) { |
650 | #if DEBUG_RX | 650 | #if DEBUG_RX |
651 | printk(KERN_DEBUG "%s: hss_hdlc_poll" | 651 | printk(KERN_DEBUG "%s: hss_hdlc_poll" |
652 | " netif_rx_complete\n", dev->name); | 652 | " napi_complete\n", dev->name); |
653 | #endif | 653 | #endif |
654 | netif_rx_complete(napi); | 654 | napi_complete(napi); |
655 | qmgr_enable_irq(rxq); | 655 | qmgr_enable_irq(rxq); |
656 | if (!qmgr_stat_empty(rxq) && | 656 | if (!qmgr_stat_empty(rxq) && |
657 | netif_rx_reschedule(napi)) { | 657 | napi_reschedule(napi)) { |
658 | #if DEBUG_RX | 658 | #if DEBUG_RX |
659 | printk(KERN_DEBUG "%s: hss_hdlc_poll" | 659 | printk(KERN_DEBUG "%s: hss_hdlc_poll" |
660 | " netif_rx_reschedule succeeded\n", | 660 | " napi_reschedule succeeded\n", |
661 | dev->name); | 661 | dev->name); |
662 | #endif | 662 | #endif |
663 | qmgr_disable_irq(rxq); | 663 | qmgr_disable_irq(rxq); |
@@ -1069,7 +1069,7 @@ static int hss_hdlc_open(struct net_device *dev) | |||
1069 | hss_start_hdlc(port); | 1069 | hss_start_hdlc(port); |
1070 | 1070 | ||
1071 | /* we may already have RX data, enables IRQ */ | 1071 | /* we may already have RX data, enables IRQ */ |
1072 | netif_rx_schedule(&port->napi); | 1072 | napi_schedule(&port->napi); |
1073 | return 0; | 1073 | return 0; |
1074 | 1074 | ||
1075 | err_unlock: | 1075 | err_unlock: |