svn commit: r332331 - stable/11/sys/dev/wl

Brooks Davis brooks at FreeBSD.org
Mon Apr 9 16:18:03 UTC 2018


Author: brooks
Date: Mon Apr  9 16:18:02 2018
New Revision: 332331
URL: https://svnweb.freebsd.org/changeset/base/332331

Log:
  Fix wl(4) after r332288.
  
  I missed that this was an assignment (a bad pattern, use another
  member) on i386.  As wl(4) is i386 only and gone in head, just
  expand the ifr_ifru member rather than adding an accessor.
  
  Reported by:	gjb

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	Mon Apr  9 15:29:14 2018	(r332330)
+++ stable/11/sys/dev/wl/if_wl.c	Mon Apr  9 16:18:02 2018	(r332331)
@@ -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_data_get_ptr(ifr) = (caddr_t) (sc->nwid[0] << 8 | sc->nwid[1]);
+	ifr->ifr_ifru.ifru_data = (caddr_t) (sc->nwid[0] << 8 | sc->nwid[1]);
 	WL_UNLOCK(sc);
 	break;
 


More information about the svn-src-all mailing list