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/sungem.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/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 f4b0beec4d19..8a7460412482 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(dev, napi); | 924 | __netif_rx_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(dev, &gp->napi)) { | 947 | if (netif_rx_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(dev, &gp->napi); | 957 | __netif_rx_schedule(&gp->napi); |
958 | } | 958 | } |
959 | 959 | ||
960 | spin_unlock_irqrestore(&gp->lock, flags); | 960 | spin_unlock_irqrestore(&gp->lock, flags); |