diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 6e3a8f73190f..f09e8dd79b0c 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1085,6 +1085,9 @@ em_if_attach_pre(if_ctx_t ctx) } } + /* Disable ULP support */ + e1000_disable_ulp_lpt_lp(hw, TRUE); + /* * Get Wake-on-Lan and Management info for later use */ @@ -3795,12 +3798,8 @@ em_enable_wakeup(if_ctx_t ctx) E1000_WRITE_REG(&adapter->hw, E1000_RCTL, rctl); } - if (!(adapter->wol & (E1000_WUFC_EX | E1000_WUFC_MAG | E1000_WUFC_MC))) { - if (adapter->hw.mac.type >= e1000_pch_lpt) { - e1000_enable_ulp_lpt_lp(&adapter->hw, TRUE); - } + if (!(adapter->wol & (E1000_WUFC_EX | E1000_WUFC_MAG | E1000_WUFC_MC))) goto pme; - } /* Advertise the wakeup capability */ ctrl = E1000_READ_REG(&adapter->hw, E1000_CTRL);