From owner-svn-src-all@freebsd.org  Tue Apr 24 16:45:14 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 E7051FAB90F;
 Tue, 24 Apr 2018 16:45:13 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 964F37484E;
 Tue, 24 Apr 2018 16:45:13 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9130C15BB6;
 Tue, 24 Apr 2018 16:45:13 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3OGjDCf017647;
 Tue, 24 Apr 2018 16:45:13 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3OGjD2I017646;
 Tue, 24 Apr 2018 16:45:13 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201804241645.w3OGjD2I017646@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 24 Apr 2018 16:45:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r332941 - stable/11/sys/dev/wl
X-SVN-Group: stable-11
X-SVN-Commit-Author: ian
X-SVN-Commit-Paths: stable/11/sys/dev/wl
X-SVN-Commit-Revision: 332941
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 &quot;
 user&quot; and &quot; projects&quot; \)" <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: Tue, 24 Apr 2018 16:45:14 -0000

Author: ian
Date: Tue Apr 24 16:45:13 2018
New Revision: 332941
URL: https://svnweb.freebsd.org/changeset/base/332941

Log:
  Fix wl(4) after r332288, using the same fix applied in r332331.  This
  driver no longer exists in head, so this is a direct commit to 11-stable.

Modified:
  stable/11/sys/dev/wl/if_wl.c

Modified: stable/11/sys/dev/wl/if_wl.c
==============================================================================
--- stable/11/sys/dev/wl/if_wl.c	Tue Apr 24 15:59:39 2018	(r332940)
+++ stable/11/sys/dev/wl/if_wl.c	Tue Apr 24 16:45:13 2018	(r332941)
@@ -1426,7 +1426,7 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	/* read out the number of used cache elements */
     case SIOCGWLCITEM:
 	WL_LOCK(sc);
-	ifr_data_get_ptr(ifr) = (caddr_t) sc->w_sigitems;
+	ifr->ifr_ifru.ifru_data = (caddr_t) sc->w_sigitems;
 	WL_UNLOCK(sc);
 	break;