summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2006-01-18 22:01:45 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-01-18 22:17:58 +0100
commit7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3 (patch)
tree7c5c95dfe9b8c6bd66e0a19dc9846173634b52df /drivers/net
parent[PATCH] e1000: fix receive breakage (diff)
downloadlinux-7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3.tar.xz
linux-7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3.zip
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e1000/e1000_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 401be1f19119..31e332935e5a 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));
}
}