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/sfc | |
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/sfc')
-rw-r--r-- | drivers/net/sfc/efx.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/efx.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 086629c0fe57..42934ba2030d 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
@@ -230,7 +230,7 @@ static int efx_poll(struct napi_struct *napi, int budget) | |||
230 | * since efx_channel_processed() will have no effect if | 230 | * since efx_channel_processed() will have no effect if |
231 | * interrupts have already been disabled. | 231 | * interrupts have already been disabled. |
232 | */ | 232 | */ |
233 | netif_rx_complete(napi_dev, napi); | 233 | netif_rx_complete(napi); |
234 | efx_channel_processed(channel); | 234 | efx_channel_processed(channel); |
235 | } | 235 | } |
236 | 236 | ||
diff --git a/drivers/net/sfc/efx.h b/drivers/net/sfc/efx.h index dd0d45b9e71f..0dd7a532c78a 100644 --- a/drivers/net/sfc/efx.h +++ b/drivers/net/sfc/efx.h | |||
@@ -77,7 +77,7 @@ static inline void efx_schedule_channel(struct efx_channel *channel) | |||
77 | channel->channel, raw_smp_processor_id()); | 77 | channel->channel, raw_smp_processor_id()); |
78 | channel->work_pending = true; | 78 | channel->work_pending = true; |
79 | 79 | ||
80 | netif_rx_schedule(channel->napi_dev, &channel->napi_str); | 80 | netif_rx_schedule(&channel->napi_str); |
81 | } | 81 | } |
82 | 82 | ||
83 | #endif /* EFX_EFX_H */ | 83 | #endif /* EFX_EFX_H */ |