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/ehea | |
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/ehea')
-rw-r--r-- | drivers/net/ehea/ehea_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 44c9ae18383..035aa7dfc5c 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -830,7 +830,7 @@ static int ehea_poll(struct napi_struct *napi, int budget) | |||
830 | while ((rx != budget) || force_irq) { | 830 | while ((rx != budget) || force_irq) { |
831 | pr->poll_counter = 0; | 831 | pr->poll_counter = 0; |
832 | force_irq = 0; | 832 | force_irq = 0; |
833 | netif_rx_complete(dev, napi); | 833 | netif_rx_complete(napi); |
834 | ehea_reset_cq_ep(pr->recv_cq); | 834 | ehea_reset_cq_ep(pr->recv_cq); |
835 | ehea_reset_cq_ep(pr->send_cq); | 835 | ehea_reset_cq_ep(pr->send_cq); |
836 | ehea_reset_cq_n1(pr->recv_cq); | 836 | ehea_reset_cq_n1(pr->recv_cq); |
@@ -859,7 +859,7 @@ static void ehea_netpoll(struct net_device *dev) | |||
859 | int i; | 859 | int i; |
860 | 860 | ||
861 | for (i = 0; i < port->num_def_qps; i++) | 861 | for (i = 0; i < port->num_def_qps; i++) |
862 | netif_rx_schedule(dev, &port->port_res[i].napi); | 862 | netif_rx_schedule(&port->port_res[i].napi); |
863 | } | 863 | } |
864 | #endif | 864 | #endif |
865 | 865 | ||
@@ -867,7 +867,7 @@ static irqreturn_t ehea_recv_irq_handler(int irq, void *param) | |||
867 | { | 867 | { |
868 | struct ehea_port_res *pr = param; | 868 | struct ehea_port_res *pr = param; |
869 | 869 | ||
870 | netif_rx_schedule(pr->port->netdev, &pr->napi); | 870 | netif_rx_schedule(&pr->napi); |
871 | 871 | ||
872 | return IRQ_HANDLED; | 872 | return IRQ_HANDLED; |
873 | } | 873 | } |