]> err.no Git - linux-2.6/commitdiff
[PATCH] e1000: fix compile warning
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Wed, 18 Jan 2006 21:01:45 +0000 (13:01 -0800)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 21:17:58 +0000 (16:17 -0500)
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>
drivers/net/e1000/e1000_main.c

index 401be1f19119ab3b78a5b671c1367178ec113680..31e332935e5a5dd335e14cbf50091f72197103e7 100644 (file)
@@ -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));
        }
 }