From owner-svn-src-all@freebsd.org Mon Apr 9 15:11:46 2018 Return-Path: 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 53692F87A74 for ; Mon, 9 Apr 2018 15:11:46 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x231.google.com (mail-it0-x231.google.com [IPv6:2607:f8b0:4001:c0b::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D6EF974F6F for ; Mon, 9 Apr 2018 15:11:45 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x231.google.com with SMTP id m134-v6so11497468itb.3 for ; Mon, 09 Apr 2018 08:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=IcgP45LvsA0dxyeA0F5EW1p0Yr7dianjX+d4V6ZrOmw=; b=l/crAJKOKejT228zU2mnz4qwfgtJGLXfWQlFmu4LQKFeXSdTjiZG6/QOlFc+ph6nPU d8X13eZtO5DhDSqg1KwSrPF/+GkwFAxQe09x3tenR3lVkoJqgEWOwHdTa3dg6gmuMhWf cCQpVZnzsH2e1M6gTGjGNDickGt/dMx2ww+qATptKX+MDbfHy+KkUw27Qo2yPuehrk2U fT0bT/a3e8WLV0wk5pFFfcgvvG8JUk6aHi0RYKCcxa3wvPZPNDdGhzM5BEqMl15rw4gy shdcVKpLfKQE5Sos63SGfZJAMfttlw+qk1CtR7ZomC2a6yCVXHyC/NCeDln/jYruVOhJ B/ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=IcgP45LvsA0dxyeA0F5EW1p0Yr7dianjX+d4V6ZrOmw=; b=H6OD4KTzP6tvwGSnFSAyqXVLmKoHZzbD7/FkEE4bqya+Ah/42yuEbBhhwTKp64VfTB b/eziikth1c9obbh2wv8DznIAwnVtfHLCXu11wK8dJrl6iuiiIFL70psXbAfAkA21R37 laV5rOAzqwVc3VGjC6OOErGGOqhwwsfTQZGuu4RWZBES732Sc0w1jBDWfRUcfl2h/fBa EfmMO47N8Cs3Jpf42z0ssWRfABYtfsdd04GiAHVZyZ3hOoyin+dAiM7Irkwv+ZRoAgER UQMcpuCSvVZEGtzzv6fWuIPfs7hr2FTk1W+KLd+F5GhGyR3kIpCu4m+pPELB7/9f7BeA 4KMA== X-Gm-Message-State: ALQs6tD/5lL7VFm3y/dIR4ASBF4zxh8mOAqWAs44CHTp1QWErEJypeqN 1uCBXFkKPeUSTRrIsQwiQfqsTnCvvPHA7EqtjXlzyA== X-Google-Smtp-Source: AIpwx48G8UifDIiCumYNYZnEkbHmI6nfkad4PBC1hfaTOKv6c8meWpAFX8pnQiO71Q2Cxm0qRBkPRjcRzMiBw5TEdUU= X-Received: by 2002:a24:1fc7:: with SMTP id d190-v6mr414606itd.57.1523286704589; Mon, 09 Apr 2018 08:11:44 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.228.135 with HTTP; Mon, 9 Apr 2018 08:11:44 -0700 (PDT) X-Originating-IP: [50.227.106.226] In-Reply-To: <20180409135849.GA84067@FreeBSD.org> References: <201804081654.w38Gs7JY007779@repo.freebsd.org> <20180409135849.GA84067@FreeBSD.org> From: Warner Losh Date: Mon, 9 Apr 2018 09:11:44 -0600 X-Google-Sender-Auth: PfZDE9aWdWQF_Hg9Ef2QAAxScP0 Message-ID: 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... To: Glen Barber Cc: Brooks Davis , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 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" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2018 15:11:46 -0000 On Mon, Apr 9, 2018 at 7:58 AM, 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 > > > > 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 > > ============================================================ > ================== > > --- 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 = copyout(psa_buf, ifr->ifr_data, sizeof(psa_buf)); > > + error = copyout(psa_buf, ifr_data_get_ptr(ifr), sizeof(psa_buf)); > > break; > > > > > > @@ -1323,7 +1323,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t > data) > > if ((error = priv_check(td, PRIV_DRIVER))) > > break; > > > > - error = copyin(ifr->ifr_data, psa_buf, sizeof(psa_buf)); > > + error = 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 = (caddr_t) (sc->nwid[0] << 8 | sc->nwid[1]); > > + ifr_data_get_ptr(ifr) = (caddr_t) (sc->nwid[0] << 8 | sc->nwid[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) = (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 > wl has been removed in -current. It's pre-802.11 ISA card with thin market penetration. I would be shocked if anybody has run this on a FreeBSD system > 4.x. Warner