aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-26 18:13:55 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-26 18:13:55 -0500
commit8d25332081d87491e3b12fa130539fe9e2ba4a94 (patch)
tree77abe8177568209c43b95cb4371564aa5efc0896
parent2d5451d2614583de0c9aaf61cf5f77faf5694105 (diff)
igb: Fix build warning when DCA is disabled.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/igb/igb_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 9331e5212461..022794e579c7 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3379,7 +3379,6 @@ static void igb_write_itr(struct igb_ring *ring)
3379static irqreturn_t igb_msix_rx(int irq, void *data) 3379static irqreturn_t igb_msix_rx(int irq, void *data)
3380{ 3380{
3381 struct igb_ring *rx_ring = data; 3381 struct igb_ring *rx_ring = data;
3382 struct igb_adapter *adapter = rx_ring->adapter;
3383 3382
3384 /* Write the ITR value calculated at the end of the 3383 /* Write the ITR value calculated at the end of the
3385 * previous interrupt. 3384 * previous interrupt.
@@ -3391,7 +3390,7 @@ static irqreturn_t igb_msix_rx(int irq, void *data)
3391 __netif_rx_schedule(&rx_ring->napi); 3390 __netif_rx_schedule(&rx_ring->napi);
3392 3391
3393#ifdef CONFIG_IGB_DCA 3392#ifdef CONFIG_IGB_DCA
3394 if (adapter->flags & IGB_FLAG_DCA_ENABLED) 3393 if (rx_ring->adapter->flags & IGB_FLAG_DCA_ENABLED)
3395 igb_update_rx_dca(rx_ring); 3394 igb_update_rx_dca(rx_ring);
3396#endif 3395#endif
3397 return IRQ_HANDLED; 3396 return IRQ_HANDLED;