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/myri10ge | |
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/myri10ge')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index f017c774e1a4..378c89e6c7d5 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -1515,7 +1515,7 @@ static int myri10ge_poll(struct napi_struct *napi, int budget) | |||
1515 | work_done = myri10ge_clean_rx_done(ss, budget); | 1515 | work_done = myri10ge_clean_rx_done(ss, budget); |
1516 | 1516 | ||
1517 | if (work_done < budget) { | 1517 | if (work_done < budget) { |
1518 | netif_rx_complete(netdev, napi); | 1518 | netif_rx_complete(napi); |
1519 | put_be32(htonl(3), ss->irq_claim); | 1519 | put_be32(htonl(3), ss->irq_claim); |
1520 | } | 1520 | } |
1521 | return work_done; | 1521 | return work_done; |
@@ -1533,7 +1533,7 @@ static irqreturn_t myri10ge_intr(int irq, void *arg) | |||
1533 | /* an interrupt on a non-zero receive-only slice is implicitly | 1533 | /* an interrupt on a non-zero receive-only slice is implicitly |
1534 | * valid since MSI-X irqs are not shared */ | 1534 | * valid since MSI-X irqs are not shared */ |
1535 | if ((mgp->dev->real_num_tx_queues == 1) && (ss != mgp->ss)) { | 1535 | if ((mgp->dev->real_num_tx_queues == 1) && (ss != mgp->ss)) { |
1536 | netif_rx_schedule(ss->dev, &ss->napi); | 1536 | netif_rx_schedule(&ss->napi); |
1537 | return (IRQ_HANDLED); | 1537 | return (IRQ_HANDLED); |
1538 | } | 1538 | } |
1539 | 1539 | ||
@@ -1544,7 +1544,7 @@ static irqreturn_t myri10ge_intr(int irq, void *arg) | |||
1544 | /* low bit indicates receives are present, so schedule | 1544 | /* low bit indicates receives are present, so schedule |
1545 | * napi poll handler */ | 1545 | * napi poll handler */ |
1546 | if (stats->valid & 1) | 1546 | if (stats->valid & 1) |
1547 | netif_rx_schedule(ss->dev, &ss->napi); | 1547 | netif_rx_schedule(&ss->napi); |
1548 | 1548 | ||
1549 | if (!mgp->msi_enabled && !mgp->msix_enabled) { | 1549 | if (!mgp->msi_enabled && !mgp->msix_enabled) { |
1550 | put_be32(0, mgp->irq_deassert); | 1550 | put_be32(0, mgp->irq_deassert); |