diff options
Diffstat (limited to 'drivers/net/sfc/efx.c')
-rw-r--r-- | drivers/net/sfc/efx.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 1ad61b7bba40..5e3f944fdd95 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
@@ -225,17 +225,17 @@ static void efx_fini_channels(struct efx_nic *efx); | |||
225 | * never be concurrently called more than once on the same channel, | 225 | * never be concurrently called more than once on the same channel, |
226 | * though different channels may be being processed concurrently. | 226 | * though different channels may be being processed concurrently. |
227 | */ | 227 | */ |
228 | static int efx_process_channel(struct efx_channel *channel, int rx_quota) | 228 | static int efx_process_channel(struct efx_channel *channel, int budget) |
229 | { | 229 | { |
230 | struct efx_nic *efx = channel->efx; | 230 | struct efx_nic *efx = channel->efx; |
231 | int rx_packets; | 231 | int spent; |
232 | 232 | ||
233 | if (unlikely(efx->reset_pending != RESET_TYPE_NONE || | 233 | if (unlikely(efx->reset_pending != RESET_TYPE_NONE || |
234 | !channel->enabled)) | 234 | !channel->enabled)) |
235 | return 0; | 235 | return 0; |
236 | 236 | ||
237 | rx_packets = efx_nic_process_eventq(channel, rx_quota); | 237 | spent = efx_nic_process_eventq(channel, budget); |
238 | if (rx_packets == 0) | 238 | if (spent == 0) |
239 | return 0; | 239 | return 0; |
240 | 240 | ||
241 | /* Deliver last RX packet. */ | 241 | /* Deliver last RX packet. */ |
@@ -249,7 +249,7 @@ static int efx_process_channel(struct efx_channel *channel, int rx_quota) | |||
249 | 249 | ||
250 | efx_fast_push_rx_descriptors(&efx->rx_queue[channel->channel]); | 250 | efx_fast_push_rx_descriptors(&efx->rx_queue[channel->channel]); |
251 | 251 | ||
252 | return rx_packets; | 252 | return spent; |
253 | } | 253 | } |
254 | 254 | ||
255 | /* Mark channel as finished processing | 255 | /* Mark channel as finished processing |
@@ -278,14 +278,14 @@ static int efx_poll(struct napi_struct *napi, int budget) | |||
278 | { | 278 | { |
279 | struct efx_channel *channel = | 279 | struct efx_channel *channel = |
280 | container_of(napi, struct efx_channel, napi_str); | 280 | container_of(napi, struct efx_channel, napi_str); |
281 | int rx_packets; | 281 | int spent; |
282 | 282 | ||
283 | EFX_TRACE(channel->efx, "channel %d NAPI poll executing on CPU %d\n", | 283 | EFX_TRACE(channel->efx, "channel %d NAPI poll executing on CPU %d\n", |
284 | channel->channel, raw_smp_processor_id()); | 284 | channel->channel, raw_smp_processor_id()); |
285 | 285 | ||
286 | rx_packets = efx_process_channel(channel, budget); | 286 | spent = efx_process_channel(channel, budget); |
287 | 287 | ||
288 | if (rx_packets < budget) { | 288 | if (spent < budget) { |
289 | struct efx_nic *efx = channel->efx; | 289 | struct efx_nic *efx = channel->efx; |
290 | 290 | ||
291 | if (channel->used_flags & EFX_USED_BY_RX && | 291 | if (channel->used_flags & EFX_USED_BY_RX && |
@@ -318,7 +318,7 @@ static int efx_poll(struct napi_struct *napi, int budget) | |||
318 | efx_channel_processed(channel); | 318 | efx_channel_processed(channel); |
319 | } | 319 | } |
320 | 320 | ||
321 | return rx_packets; | 321 | return spent; |
322 | } | 322 | } |
323 | 323 | ||
324 | /* Process the eventq of the specified channel immediately on this CPU | 324 | /* Process the eventq of the specified channel immediately on this CPU |