From 85355a5e3dec518ff05e097e9cbc8a977afe237a Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 26 Dec 2008 15:13:55 -0800 Subject: [PATCH] --- yaml --- r: 122952 b: refs/heads/master c: 8d25332081d87491e3b12fa130539fe9e2ba4a94 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 95b0dbf3cd88..fb96b3445b3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d5451d2614583de0c9aaf61cf5f77faf5694105 +refs/heads/master: 8d25332081d87491e3b12fa130539fe9e2ba4a94 diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index 9331e5212461..022794e579c7 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/drivers/net/igb/igb_main.c @@ -3379,7 +3379,6 @@ static void igb_write_itr(struct igb_ring *ring) static irqreturn_t igb_msix_rx(int irq, void *data) { struct igb_ring *rx_ring = data; - struct igb_adapter *adapter = rx_ring->adapter; /* Write the ITR value calculated at the end of the * previous interrupt. @@ -3391,7 +3390,7 @@ static irqreturn_t igb_msix_rx(int irq, void *data) __netif_rx_schedule(&rx_ring->napi); #ifdef CONFIG_IGB_DCA - if (adapter->flags & IGB_FLAG_DCA_ENABLED) + if (rx_ring->adapter->flags & IGB_FLAG_DCA_ENABLED) igb_update_rx_dca(rx_ring); #endif return IRQ_HANDLED;