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/ibmveth.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/ibmveth.c')
-rw-r--r-- | drivers/net/ibmveth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 02ecfdb4df6b..1f055a955089 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
@@ -1028,7 +1028,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget) | |||
1028 | 1028 | ||
1029 | ibmveth_assert(lpar_rc == H_SUCCESS); | 1029 | ibmveth_assert(lpar_rc == H_SUCCESS); |
1030 | 1030 | ||
1031 | netif_rx_complete(netdev, napi); | 1031 | netif_rx_complete(napi); |
1032 | 1032 | ||
1033 | if (ibmveth_rxq_pending_buffer(adapter) && | 1033 | if (ibmveth_rxq_pending_buffer(adapter) && |
1034 | netif_rx_reschedule(netdev, napi)) { | 1034 | netif_rx_reschedule(netdev, napi)) { |
@@ -1047,11 +1047,11 @@ static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance) | |||
1047 | struct ibmveth_adapter *adapter = netdev_priv(netdev); | 1047 | struct ibmveth_adapter *adapter = netdev_priv(netdev); |
1048 | unsigned long lpar_rc; | 1048 | unsigned long lpar_rc; |
1049 | 1049 | ||
1050 | if (netif_rx_schedule_prep(netdev, &adapter->napi)) { | 1050 | if (netif_rx_schedule_prep(&adapter->napi)) { |
1051 | lpar_rc = h_vio_signal(adapter->vdev->unit_address, | 1051 | lpar_rc = h_vio_signal(adapter->vdev->unit_address, |
1052 | VIO_IRQ_DISABLE); | 1052 | VIO_IRQ_DISABLE); |
1053 | ibmveth_assert(lpar_rc == H_SUCCESS); | 1053 | ibmveth_assert(lpar_rc == H_SUCCESS); |
1054 | __netif_rx_schedule(netdev, &adapter->napi); | 1054 | __netif_rx_schedule(&adapter->napi); |
1055 | } | 1055 | } |
1056 | return IRQ_HANDLED; | 1056 | return IRQ_HANDLED; |
1057 | } | 1057 | } |