From 19117a1ccc9b3f818bbdf71ae5ca61e1ee8de4c1 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 10 Feb 2012 23:01:48 +0000 Subject: [PATCH] --- yaml --- r: 290172 b: refs/heads/master c: 9d9a6973a890c5b2258e717e4aae716720e60fcb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sfc/efx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d0a413f6cd71..1f4a314b6722 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f2cb71c2b0ce33c472856c0feec2883fa0d9cd1 +refs/heads/master: 9d9a6973a890c5b2258e717e4aae716720e60fcb diff --git a/trunk/drivers/net/ethernet/sfc/efx.c b/trunk/drivers/net/ethernet/sfc/efx.c index ccfb43c9968d..eda2272bc4c0 100644 --- a/trunk/drivers/net/ethernet/sfc/efx.c +++ b/trunk/drivers/net/ethernet/sfc/efx.c @@ -279,7 +279,7 @@ static int efx_poll(struct napi_struct *napi, int budget) spent = efx_process_channel(channel, budget); if (spent < budget) { - if (channel->channel < efx->n_rx_channels && + if (efx_channel_has_rx_queue(channel) && efx->irq_rx_adaptive && unlikely(++channel->irq_count == 1000)) { if (unlikely(channel->irq_mod_score <