Date: Mon, 9 Apr 2018 15:19:09 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Warner Losh <imp@bsdimp.com> Cc: Brooks Davis <brooks@freebsd.org>, src-committers <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: <20180409151909.GA86045@FreeBSD.org> In-Reply-To: <CANCZdfr3Nm3C3nSNw%2Bh8LJeH3RyrkXsqHyW4yiW32qA4SUVxJQ@mail.gmail.com> References: <201804081654.w38Gs7JY007779@repo.freebsd.org> <20180409135849.GA84067@FreeBSD.org> <CANCZdfr3Nm3C3nSNw%2Bh8LJeH3RyrkXsqHyW4yiW32qA4SUVxJQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--C7zPtVaVf+AK4Oqc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 09, 2018 at 09:11:44AM -0600, Warner Losh wrote: > On Mon, Apr 9, 2018 at 7:58 AM, Glen Barber <gjb@freebsd.org> wrote: >=20 > > 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 > > > > > > Log: > > > MFC r331797: > > > > > > Use an accessor function to access ifr_data. > > > > > > This fixes 32-bit compat (no ioctl command defintions are required > > > as struct ifreq is the same size). > > > > > > Reviewed by: kib > > > Obtained from: CheriBSD > > > Sponsored by: DARPA, AFRL > > > Differential Revision: https://reviews.freebsd.org/D14900 > > > > > > Modified: > > [...] > > > stable/11/sys/dev/wl/if_wl.c > > > > > Directory Properties: > > > stable/11/ (props changed) > > > > > [...] > > > 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); > > > > > > - error =3D copyout(psa_buf, ifr->ifr_data, sizeof(psa_buf)); > > > + error =3D copyout(psa_buf, ifr_data_get_ptr(ifr), sizeof(psa_bu= f)); > > > break; > > > > > > > > > @@ -1323,7 +1323,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t > > data) > > > if ((error =3D priv_check(td, PRIV_DRIVER))) > > > break; > > > > > > - 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; > > > > > > @@ -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->nwi= d[1]); > > > WL_UNLOCK(sc); > > > break; > > > > > > > This part of the change appears to have broken i386 with the following: > > > > /usr/src/sys/modules/wl/../../dev/wl/if_wl.c:1360:24: error: expression > > is not assignable > > ifr_data_get_ptr(ifr) =3D (caddr_t) (sc->nwid[0] << 8 | > > sc->nwid[1]); > > ~~~~~~~~~~~~~~~~~~~~~ ^ > > 1 error generated. > > --- if_wl.o --- > > *** [if_wl.o] Error code 1 > > > > make[4]: stopped in /usr/src/sys/modules/wl > > 1 error > > >=20 > wl has been removed in -current. It's pre-802.11 ISA card with thin mark= et > penetration. I would be shocked if anybody has run this on a FreeBSD syst= em > > 4.x. >=20 This commit is to stable/11. Glen --C7zPtVaVf+AK4Oqc Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAlrLhGkACgkQAxRYpUeP 4pMzKg/+IF5RcZA2549N9JKhbGbIMtbGvqJv8YYvRI8arP77ABLzUQIb7VietEv9 Ddvtg64dRuEWQiHGpkZZbey5qN2uw8A2hVXqqNA1YKXoZUEsVw8PD6ww8dVy9N7n T+iPE/7oRMlby97fH/p2SshZiQ0rlghkNvidkEwjjj1cdGhwQLMGOATN8TR7zs0t 6dJnuJxcUgwOdC84U9q10J17x0Kx+vmz0szikCR0AF5wURkheYwTZUKsYgZ4Bjlu hskgFyd+S6emqpIjZ61RMJ1dT0IjcyoxMhYLmghQjcF3t2Okg+CWdAAtEv196S8x /+08kMYfKWu8anxqFbLf4TRcBL5rMxp9unXY/9Fq2wn0Xipz6AtGuPjarBNxMOJq 744FZU9rQTm7N6oU5cN7YrUDI7uododbFC5Ir3ZgzP8IegaxMOmFgo+CK/bOL/88 X5ddvQXeKmw9eV6ko7iV/ULS4KVj5Ze/LT6Gp0HSd5pXbBLEezlSTR4kgxzkBS8s 1b3ViZ98XteVHgP52Hp6hyJisdM8pVEsJVppfDcCU6rfgGJVu+56BAYQcrWwBQrC d/Ub9kEMjzh81HOfwRwJ5Vqk4rpWL0DmAaW8wD9yKUeSfda8tDkxrdEeismHmWX8 3bf5fyfVHKKQQ3YVEjEG94L3gcTo39uq5/nZGKhjoWUIPq/sGtc= =dxuA -----END PGP SIGNATURE----- --C7zPtVaVf+AK4Oqc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180409151909.GA86045>