From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Wed, 18 Jan 2006 21:01:45 +0000 (-0800)
Subject: [PATCH] e1000: fix compile warning
X-Git-Tag: v2.6.16-rc2~356
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3;p=linux-2.6

[PATCH] e1000: fix compile warning

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 401be1f191..31e332935e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2186,9 +2186,9 @@ e1000_leave_82542_rst(struct e1000_adapter *adapter)
 		e1000_pci_set_mwi(&adapter->hw);
 
 	if (netif_running(netdev)) {
-		e1000_configure_rx(adapter);
 		/* No need to loop, because 82542 supports only 1 queue */
 		struct e1000_rx_ring *ring = &adapter->rx_ring[0];
+		e1000_configure_rx(adapter);
 		adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring));
 	}
 }