diff options
Diffstat (limited to 'drivers/net/sungem.c')
-rw-r--r-- | drivers/net/sungem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 86c765d83de1..4942059109f3 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
@@ -921,7 +921,7 @@ static int gem_poll(struct napi_struct *napi, int budget) | |||
921 | gp->status = readl(gp->regs + GREG_STAT); | 921 | gp->status = readl(gp->regs + GREG_STAT); |
922 | } while (gp->status & GREG_STAT_NAPI); | 922 | } while (gp->status & GREG_STAT_NAPI); |
923 | 923 | ||
924 | __netif_rx_complete(napi); | 924 | __napi_complete(napi); |
925 | gem_enable_ints(gp); | 925 | gem_enable_ints(gp); |
926 | 926 | ||
927 | spin_unlock_irqrestore(&gp->lock, flags); | 927 | spin_unlock_irqrestore(&gp->lock, flags); |
@@ -944,7 +944,7 @@ static irqreturn_t gem_interrupt(int irq, void *dev_id) | |||
944 | 944 | ||
945 | spin_lock_irqsave(&gp->lock, flags); | 945 | spin_lock_irqsave(&gp->lock, flags); |
946 | 946 | ||
947 | if (netif_rx_schedule_prep(&gp->napi)) { | 947 | if (napi_schedule_prep(&gp->napi)) { |
948 | u32 gem_status = readl(gp->regs + GREG_STAT); | 948 | u32 gem_status = readl(gp->regs + GREG_STAT); |
949 | 949 | ||
950 | if (gem_status == 0) { | 950 | if (gem_status == 0) { |
@@ -954,7 +954,7 @@ static irqreturn_t gem_interrupt(int irq, void *dev_id) | |||
954 | } | 954 | } |
955 | gp->status = gem_status; | 955 | gp->status = gem_status; |
956 | gem_disable_ints(gp); | 956 | gem_disable_ints(gp); |
957 | __netif_rx_schedule(&gp->napi); | 957 | __napi_schedule(&gp->napi); |
958 | } | 958 | } |
959 | 959 | ||
960 | spin_unlock_irqrestore(&gp->lock, flags); | 960 | spin_unlock_irqrestore(&gp->lock, flags); |