From 482b9a5bb2cb002242f8102c65e8108fdc725be1 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 27 Jun 2006 09:06:41 -0700 Subject: [PATCH] --- yaml --- r: 32173 b: refs/heads/master c: 0cbabbb0725fa34a37d6b7870b2d2fe17d1a0a94 h: refs/heads/master i: 32171: 37673389fa1bb7343aa5e17c8f4fbfe723a018e0 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8f3df18ade1e..d63885540945 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fdfef162426766611b1f640138e4720f56e45f8 +refs/heads/master: 0cbabbb0725fa34a37d6b7870b2d2fe17d1a0a94 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 7cf5e5dce0da..76e36a4fd985 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -3717,7 +3717,6 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, buffer_info = &rx_ring->buffer_info[i]; while (staterr & E1000_RXD_STAT_DD) { - buffer_info = &rx_ring->buffer_info[i]; ps_page = &rx_ring->ps_page[i]; ps_page_dma = &rx_ring->ps_page_dma[i]; #ifdef CONFIG_E1000_NAPI