e1000: don't enable dma receives until after dma address has been setup

[deliverable/linux.git] / drivers / net / ethernet / intel / e1000 / e1000_main.c

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 27f586afcc34bc1a47dcc36d92ca8f07232f5a7a..4bbc05ad9ba13a95eb62bb955fea072df0e5c6fc 100644 (file)
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -1814,8 +1814,8 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
 
        rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
 
-       rctl |= E1000_RCTL_EN | E1000_RCTL_BAM |
-               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
+       rctl |= E1000_RCTL_BAM | E1000_RCTL_LBM_NO |
+               E1000_RCTL_RDMTS_HALF |
                (hw->mc_filter_type << E1000_RCTL_MO_SHIFT);
 
        if (hw->tbi_compatibility_on == 1)
@@ -1917,7 +1917,7 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
        }
 
        /* Enable Receives */
-       ew32(RCTL, rctl);
+       ew32(RCTL, rctl | E1000_RCTL_EN);
 }
 
 /**