I'll mf stable/10 in a bit. sean
On 05/26/18 14:02, Sean Bruno wrote: > Author: sbruno > Date: Sat May 26 20:02:39 2018 > New Revision: 334246 > URL: https://svnweb.freebsd.org/changeset/base/334246 > > Log: > Activate Wake On Lan features for Ice Lake and Cannon Lake devices. > > This is a direct commit to stable/11 as its not needed in -current. > > PR: 228302 > Submitted by: Kaho Toshikazu <k...@elam.kais.kyoto-u.ac.jp> > Approved by: re (kib) > > Modified: > stable/11/sys/dev/e1000/if_em.c > > Modified: stable/11/sys/dev/e1000/if_em.c > ============================================================================== > --- stable/11/sys/dev/e1000/if_em.c Sat May 26 19:38:31 2018 > (r334245) > +++ stable/11/sys/dev/e1000/if_em.c Sat May 26 20:02:39 2018 > (r334246) > @@ -5411,7 +5411,8 @@ em_enable_wakeup(device_t dev) > if ((adapter->hw.mac.type == e1000_pchlan) || > (adapter->hw.mac.type == e1000_pch2lan) || > (adapter->hw.mac.type == e1000_pch_lpt) || > - (adapter->hw.mac.type == e1000_pch_spt)) { > + (adapter->hw.mac.type == e1000_pch_spt) || > + (adapter->hw.mac.type == e1000_pch_cnp)) { > error = em_enable_phy_wakeup(adapter); > if (error) > goto pme; > >
signature.asc
Description: OpenPGP digital signature
