View | Details | Raw Unified | Return to bug 258153 | Differences between
and this patch

Collapse All | Expand All

(-)b/sys/dev/e1000/if_em.c (-5 / +4 lines)
Lines 1085-1090 em_if_attach_pre(if_ctx_t ctx) Link Here
1085
		}
1085
		}
1086
	}
1086
	}
1087
1087
1088
	/* Disable ULP support */
1089
	e1000_disable_ulp_lpt_lp(hw, TRUE);
1090
1088
	/*
1091
	/*
1089
	 * Get Wake-on-Lan and Management info for later use
1092
	 * Get Wake-on-Lan and Management info for later use
1090
	 */
1093
	 */
Lines 3795-3806 em_enable_wakeup(if_ctx_t ctx) Link Here
3795
		E1000_WRITE_REG(&adapter->hw, E1000_RCTL, rctl);
3798
		E1000_WRITE_REG(&adapter->hw, E1000_RCTL, rctl);
3796
	}
3799
	}
3797
3800
3798
	if (!(adapter->wol & (E1000_WUFC_EX | E1000_WUFC_MAG | E1000_WUFC_MC))) {
3801
	if (!(adapter->wol & (E1000_WUFC_EX | E1000_WUFC_MAG | E1000_WUFC_MC)))
3799
		if (adapter->hw.mac.type >= e1000_pch_lpt) {
3800
			e1000_enable_ulp_lpt_lp(&adapter->hw, TRUE);
3801
		}
3802
		goto pme;
3802
		goto pme;
3803
	}
3804
3803
3805
	/* Advertise the wakeup capability */
3804
	/* Advertise the wakeup capability */
3806
	ctrl = E1000_READ_REG(&adapter->hw, E1000_CTRL);
3805
	ctrl = E1000_READ_REG(&adapter->hw, E1000_CTRL);

Return to bug 258153