From owner-svn-src-all@freebsd.org Mon Apr 9 16:25:49 2018 Return-Path: <owner-svn-src-all@freebsd.org> Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0373F8CD45; Mon, 9 Apr 2018 16:25:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 92ED37EAFD; Mon, 9 Apr 2018 16:25:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id C80F41981B; Mon, 9 Apr 2018 16:25:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Mon, 9 Apr 2018 16:25:43 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Brooks Davis <brooks@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r332288 - in stable/11/sys: dev/an dev/ath dev/cxgbe dev/de dev/en dev/fatm dev/hatm dev/if_ndis dev/iwi dev/ixgbe dev/ixl dev/mlx4/mlx4_en dev/mlx5/mlx5_en dev/mwl dev/nxge dev/oce dev... Message-ID: <20180409162543.GE33065@FreeBSD.org> References: <201804081654.w38Gs7JY007779@repo.freebsd.org> <20180409135849.GA84067@FreeBSD.org> <20180409153250.GB3560@spindle.one-eyed-alien.net> <20180409161911.GC3560@spindle.one-eyed-alien.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="b5gNqxB1S1yM7hjW" Content-Disposition: inline In-Reply-To: <20180409161911.GC3560@spindle.one-eyed-alien.net> User-Agent: Mutt/1.9.1 (2017-09-22) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" <svn-src-all.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/> List-Post: <mailto:svn-src-all@freebsd.org> List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 09 Apr 2018 16:25:49 -0000 --b5gNqxB1S1yM7hjW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 09, 2018 at 04:19:11PM +0000, Brooks Davis wrote: > On Mon, Apr 09, 2018 at 03:32:50PM +0000, Brooks Davis wrote: > > On Mon, Apr 09, 2018 at 01:58:49PM +0000, Glen Barber wrote: > > > On Sun, Apr 08, 2018 at 04:54:07PM +0000, Brooks Davis wrote: > > > > Author: brooks > > > > Date: Sun Apr 8 16:54:07 2018 > > > > New Revision: 332288 > > > > URL: https://svnweb.freebsd.org/changeset/base/332288 > > > >=20 > > > > Log: > > > > MFC r331797: > > > > =20 > > > > Use an accessor function to access ifr_data. > > > > =20 > > > > This fixes 32-bit compat (no ioctl command defintions are required > > > > as struct ifreq is the same size). > > > > =20 > > > > Reviewed by: kib > > > > Obtained from: CheriBSD > > > > Sponsored by: DARPA, AFRL > > > > Differential Revision: https://reviews.freebsd.org/D14900 > > > >=20 > > > > Modified: > > > [...] > > > > stable/11/sys/dev/wl/if_wl.c > > >=20 > > > > Directory Properties: > > > > stable/11/ (props changed) > > > >=20 > > > [...] > > > > Modified: stable/11/sys/dev/wl/if_wl.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/wl/if_wl.c Sun Apr 8 16:46:24 2018 (r332287) > > > > +++ stable/11/sys/dev/wl/if_wl.c Sun Apr 8 16:54:07 2018 (r332288) > > > > @@ -1313,7 +1313,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_= t data) > > > > } > > > > WL_UNLOCK(sc); > > > > =20 > > > > - error =3D copyout(psa_buf, ifr->ifr_data, sizeof(psa_buf)); > > > > + error =3D copyout(psa_buf, ifr_data_get_ptr(ifr), sizeof(psa_buf)= ); > > > > break; > > > > =20 > > > > =20 > > > > @@ -1323,7 +1323,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_= t data) > > > > if ((error =3D priv_check(td, PRIV_DRIVER))) > > > > break; > > > > =20 > > > > - error =3D copyin(ifr->ifr_data, psa_buf, sizeof(psa_buf)); > > > > + error =3D copyin(ifr_data_get_ptr(ifr), psa_buf, sizeof(psa_buf)); > > > > if (error) > > > > break; > > > > =09 > > > > @@ -1357,7 +1357,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_= t data) > > > > /* get the current NWID out of the sc since we stored it there */ > > > > case SIOCGWLCNWID: > > > > WL_LOCK(sc); > > > > - ifr->ifr_data =3D (caddr_t) (sc->nwid[0] << 8 | sc->nwid[1]); > > > > + ifr_data_get_ptr(ifr) =3D (caddr_t) (sc->nwid[0] << 8 | sc->nwid[= 1]); > > > > WL_UNLOCK(sc); > > > > break; > > > > =20 > > >=20 > > > This part of the change appears to have broken i386 with the followin= g: > >=20 > > Sorry about this, will fix shortly. >=20 > Fixed in r332331. >=20 Thank you. Glen --b5gNqxB1S1yM7hjW Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAlrLlAcACgkQAxRYpUeP 4pPOFg/8C8YQzraWFW75rkAi3pyXmDc9lGX0sJdSDPLMMzzdFiAB5Ngp/99sb657 Ub+UkquTBBy+s8LSxxirM+iQPD5T95Cu0D2QmGlTgi4RK4DKXUqAvP7p3ChBvI8q GHnKbtZp2QAaagt/geqaCBekyuuRwbQJS374goE4c8u7UOpDlWQffaUL95MGvdq/ aiTz7ojTiWe4cFWN3uYo1+1Q5LQpR2VAIaGsILuye/L79iUOnrCOs5+qoTojFPOB RfDR3aVgb/EG3pJMTlUY27Bv2Gym58sNRo4qIkWtN2SFPqftPAL2OGPKXPXOQ8YO RohTM78hhMhjGrUyvgOpODhXsn3uGZY5MxH0mXckZNtahrJP14G/ZAEEyRVGO7cV 02EDEOJziuxE+jgDu4b2VRSnPDi8aOrhyc/8v8G01LVEaRxmXiFH9Ywur/dUqmrf HTWEtgrDQozqFVSlvDiGQkwEue5y3fNANsLiP8GCAJnzDp7PmubgaRZ51jgOFpyF Hnxdt3I8HN/rLzZHh3qenI64nDN7qntrf3vDqFQ+0npa3LZyX/t1RMWopwY9j7Ye LYn0uB9OsLct1HV/n0VMd1UfSl3xAWAMTHVsOT1/J+u8n+Z/TdfAnnekiN1rD81o 3CSGjF2XImOqni+KpF5s81oEnRGHrWT2u+36WD13rKUl0yVHuww= =ZLUi -----END PGP SIGNATURE----- --b5gNqxB1S1yM7hjW--