Date: Sat, 26 May 2018 14:17:39 -0600 From: Sean Bruno <sbruno@freebsd.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r334246 - stable/11/sys/dev/e1000 Message-ID: <61ff0368-f75b-6145-13fe-295b0afd2a7e@freebsd.org> In-Reply-To: <201805262002.w4QK2dHw087147@repo.freebsd.org> References: <201805262002.w4QK2dHw087147@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --iTN4jPHdaU7oEDbtst7ky3snnb2Zh3CzN Content-Type: multipart/mixed; boundary="w0t8bBd9uTxaXmYmOug8ohby4rZ7A5eIa"; protected-headers="v1" From: Sean Bruno <sbruno@freebsd.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Message-ID: <61ff0368-f75b-6145-13fe-295b0afd2a7e@freebsd.org> Subject: Re: svn commit: r334246 - stable/11/sys/dev/e1000 References: <201805262002.w4QK2dHw087147@repo.freebsd.org> In-Reply-To: <201805262002.w4QK2dHw087147@repo.freebsd.org> --w0t8bBd9uTxaXmYmOug8ohby4rZ7A5eIa Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Activate Wake On Lan features for Ice Lake and Cannon Lake devices. > =20 > This is a direct commit to stable/11 as its not needed in -current. > =20 > PR: 228302 > Submitted by: Kaho Toshikazu <kaho@elam.kais.kyoto-u.ac.jp> > Approved by: re (kib) >=20 > Modified: > stable/11/sys/dev/e1000/if_em.c >=20 > Modified: stable/11/sys/dev/e1000/if_em.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 =3D=3D e1000_pchlan) || > (adapter->hw.mac.type =3D=3D e1000_pch2lan) || > (adapter->hw.mac.type =3D=3D e1000_pch_lpt) || > - (adapter->hw.mac.type =3D=3D e1000_pch_spt)) { > + (adapter->hw.mac.type =3D=3D e1000_pch_spt) || > + (adapter->hw.mac.type =3D=3D e1000_pch_cnp)) { > error =3D em_enable_phy_wakeup(adapter); > if (error) > goto pme; >=20 >=20 --w0t8bBd9uTxaXmYmOug8ohby4rZ7A5eIa-- --iTN4jPHdaU7oEDbtst7ky3snnb2Zh3CzN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE6MTp+IA1BOHj9Lo0veT1/om1/LYFAlsJwONfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEU4 QzRFOUY4ODAzNTA0RTFFM0Y0QkEzNEJERTRGNUZFODlCNUZDQjYACgkQveT1/om1 /LYdcgf+M5hNlVjzgOCoKEYPcDETWh1VQErqtXjUHFDyPHeMLW0oj2bSN6Ut+Leh unQ4ZN7hgo4AaAGQRz9dkDZxb8NFEsSHxEhFnfMlN6V/PBiIjnIOrAD48l0XcQVb breziOCE2B2PinoojenIbeve9M5lOYAlHJAR6yWbw9iZpoz5pQ0+BqXUP9vnsEiN Qg5cdWEZU7xbH4IR0v11YR5O0h5Sfou9KOp3/Ro4yLHUmDgf6d4kdhscfxAdYcel yZKQYtXFZD5uZyWBVHzXeMU1UX6sNd1+JKioKdLP1R868GN8GMgXsBpYwSEv6AlP 7Qj/Y/SMHHrloByGjw0clfxJn0pjjw== =dWYM -----END PGP SIGNATURE----- --iTN4jPHdaU7oEDbtst7ky3snnb2Zh3CzN--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?61ff0368-f75b-6145-13fe-295b0afd2a7e>