1 files changed, 4 insertions, 30 deletions

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index f58f017ee47a..3031d6d16247 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1055,23 +1055,6 @@ static void e1000_release_hw_control(struct e1000_adapter *adapter)
         }
 }
 
-static void e1000_release_manageability(struct e1000_adapter *adapter)
-{
-        if (adapter->flags & FLAG_MNG_PT_ENABLED) {
-                struct e1000_hw *hw = &adapter->hw;
-
-                u32 manc = er32(MANC);
-
-                /* re-enable hardware interception of ARP */
-                manc |= E1000_MANC_ARP_EN;
-                manc &= ~E1000_MANC_EN_MNG2HOST;
-
-                /* don't explicitly have to mess with MANC2H since
-                 * MANC has an enable disable that gates MANC2H */
-                ew32(MANC, manc);
-        }
-}
-
 /**
  * @e1000_alloc_ring - allocate memory for a ring structure
  **/
@@ -1561,9 +1544,6 @@ static void e1000_init_manageability(struct e1000_adapter *adapter)
 
         manc = er32(MANC);
 
-        /* disable hardware interception of ARP */
-        manc &= ~(E1000_MANC_ARP_EN);
-
         /* enable receiving management packets to the host. this will probably
          * generate destination unreachable messages from the host OS, but
          * the packets will be handled on SMBUS */
@@ -1690,6 +1670,9 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
         else
                 rctl |= E1000_RCTL_LPE;
 
+        /* Enable hardware CRC frame stripping */
+        rctl |= E1000_RCTL_SECRC;
+
         /* Setup buffer sizes */
         rctl &= ~E1000_RCTL_SZ_4096;
         rctl |= E1000_RCTL_BSEX;
@@ -1755,9 +1738,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
 
                 /* Enable Packet split descriptors */
                 rctl |= E1000_RCTL_DTYP_PS;
-                
-                /* Enable hardware CRC frame stripping */
-                rctl |= E1000_RCTL_SECRC;
 
                 psrctl |= adapter->rx_ps_bsize0 >>
                         E1000_PSRCTL_BSIZE0_SHIFT;
@@ -2008,7 +1988,7 @@ static void e1000_power_down_phy(struct e1000_adapter *adapter)
         u16 mii_reg;
 
         /* WoL is enabled */
-        if (!adapter->wol)
+        if (adapter->wol)
                 return;
 
         /* non-copper PHY? */
@@ -2140,8 +2120,6 @@ void e1000e_reset(struct e1000_adapter *adapter)
                 phy_data &= ~IGP02E1000_PM_SPD;
                 e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, phy_data);
         }
-
-        e1000_release_manageability(adapter);
 }
 
 int e1000e_up(struct e1000_adapter *adapter)
@@ -3487,8 +3465,6 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
                 pci_enable_wake(pdev, PCI_D3cold, 0);
         }
 
-        e1000_release_manageability(adapter);
-
         /* make sure adapter isn't asleep if manageability is enabled */
         if (adapter->flags & FLAG_MNG_PT_ENABLED) {
                 pci_enable_wake(pdev, PCI_D3hot, 1);
@@ -4054,8 +4030,6 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
 
         flush_scheduled_work();
 
-        e1000_release_manageability(adapter);
-
         /* Release control of h/w to f/w.  If f/w is AMT enabled, this
          * would have already happened in close and is redundant. */
         e1000_release_hw_control(adapter);