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/e100.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/e100.c')
-rw-r--r-- | drivers/net/e100.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index dce7ff28c3ff..9f38b16ccbbd 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -2049,9 +2049,9 @@ static irqreturn_t e100_intr(int irq, void *dev_id) | |||
2049 | if(stat_ack & stat_ack_rnr) | 2049 | if(stat_ack & stat_ack_rnr) |
2050 | nic->ru_running = RU_SUSPENDED; | 2050 | nic->ru_running = RU_SUSPENDED; |
2051 | 2051 | ||
2052 | if(likely(netif_rx_schedule_prep(netdev, &nic->napi))) { | 2052 | if(likely(netif_rx_schedule_prep(&nic->napi))) { |
2053 | e100_disable_irq(nic); | 2053 | e100_disable_irq(nic); |
2054 | __netif_rx_schedule(netdev, &nic->napi); | 2054 | __netif_rx_schedule(&nic->napi); |
2055 | } | 2055 | } |
2056 | 2056 | ||
2057 | return IRQ_HANDLED; | 2057 | return IRQ_HANDLED; |
@@ -2060,7 +2060,6 @@ static irqreturn_t e100_intr(int irq, void *dev_id) | |||
2060 | static int e100_poll(struct napi_struct *napi, int budget) | 2060 | static int e100_poll(struct napi_struct *napi, int budget) |
2061 | { | 2061 | { |
2062 | struct nic *nic = container_of(napi, struct nic, napi); | 2062 | struct nic *nic = container_of(napi, struct nic, napi); |
2063 | struct net_device *netdev = nic->netdev; | ||
2064 | unsigned int work_done = 0; | 2063 | unsigned int work_done = 0; |
2065 | 2064 | ||
2066 | e100_rx_clean(nic, &work_done, budget); | 2065 | e100_rx_clean(nic, &work_done, budget); |
@@ -2068,7 +2067,7 @@ static int e100_poll(struct napi_struct *napi, int budget) | |||
2068 | 2067 | ||
2069 | /* If budget not fully consumed, exit the polling mode */ | 2068 | /* If budget not fully consumed, exit the polling mode */ |
2070 | if (work_done < budget) { | 2069 | if (work_done < budget) { |
2071 | netif_rx_complete(netdev, napi); | 2070 | netif_rx_complete(napi); |
2072 | e100_enable_irq(nic); | 2071 | e100_enable_irq(nic); |
2073 | } | 2072 | } |
2074 | 2073 | ||