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/ixgb | |
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/ixgb')
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 820a92cc7f62..679125b3bbc9 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -1721,14 +1721,14 @@ ixgb_intr(int irq, void *data) | |||
1721 | if (!test_bit(__IXGB_DOWN, &adapter->flags)) | 1721 | if (!test_bit(__IXGB_DOWN, &adapter->flags)) |
1722 | mod_timer(&adapter->watchdog_timer, jiffies); | 1722 | mod_timer(&adapter->watchdog_timer, jiffies); |
1723 | 1723 | ||
1724 | if (netif_rx_schedule_prep(netdev, &adapter->napi)) { | 1724 | if (netif_rx_schedule_prep(&adapter->napi)) { |
1725 | 1725 | ||
1726 | /* Disable interrupts and register for poll. The flush | 1726 | /* Disable interrupts and register for poll. The flush |
1727 | of the posted write is intentionally left out. | 1727 | of the posted write is intentionally left out. |
1728 | */ | 1728 | */ |
1729 | 1729 | ||
1730 | IXGB_WRITE_REG(&adapter->hw, IMC, ~0); | 1730 | IXGB_WRITE_REG(&adapter->hw, IMC, ~0); |
1731 | __netif_rx_schedule(netdev, &adapter->napi); | 1731 | __netif_rx_schedule(&adapter->napi); |
1732 | } | 1732 | } |
1733 | return IRQ_HANDLED; | 1733 | return IRQ_HANDLED; |
1734 | } | 1734 | } |
@@ -1750,7 +1750,7 @@ ixgb_clean(struct napi_struct *napi, int budget) | |||
1750 | 1750 | ||
1751 | /* If budget not fully consumed, exit the polling mode */ | 1751 | /* If budget not fully consumed, exit the polling mode */ |
1752 | if (work_done < budget) { | 1752 | if (work_done < budget) { |
1753 | netif_rx_complete(netdev, napi); | 1753 | netif_rx_complete(napi); |
1754 | if (!test_bit(__IXGB_DOWN, &adapter->flags)) | 1754 | if (!test_bit(__IXGB_DOWN, &adapter->flags)) |
1755 | ixgb_irq_enable(adapter); | 1755 | ixgb_irq_enable(adapter); |
1756 | } | 1756 | } |