svn commit: r286949 - head/sys/dev/usb/wlan

[Adrian Chadd]

Author: adrian
Date: Thu Aug 20 03:57:41 2015
New Revision: 286949
URL: https://svnweb.freebsd.org/changeset/base/286949

Log:
  Remove some if_softc references from urtwn(4).
  
  The only ones that are left are in if_start, if_stop and ioctl.
  
  Tested:
  
  * urtwn0: MAC/BB RTL8188CUS, RF 6052 1T1R, STA mode

Modified:
  head/sys/dev/usb/wlan/if_urtwn.c

Modified: head/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtwn.c	Thu Aug 20 00:00:15 2015	(r286948)
+++ head/sys/dev/usb/wlan/if_urtwn.c	Thu Aug 20 03:57:41 2015	(r286949)
@@ -1513,7 +1513,7 @@ urtwn_newstate(struct ieee80211vap *vap,
 {
 	struct urtwn_vap *uvp = URTWN_VAP(vap);
 	struct ieee80211com *ic = vap->iv_ic;
-	struct urtwn_softc *sc = ic->ic_ifp->if_softc;
+	struct urtwn_softc *sc = ic->ic_softc;
 	struct ieee80211_node *ni;
 	enum ieee80211_state ostate;
 	uint32_t reg;
@@ -1989,8 +1989,8 @@ urtwn_start_locked(struct ifnet *ifp, st
 static int
 urtwn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
-	struct urtwn_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = ifp->if_l2com;
+	struct urtwn_softc *sc = ic->ic_softc;
 	struct ifreq *ifr = (struct ifreq *) data;
 	int error = 0, startall = 0;
 
@@ -2004,7 +2004,7 @@ urtwn_ioctl(struct ifnet *ifp, u_long cm
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
 			if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
-				urtwn_init(ifp->if_softc);
+				urtwn_init(sc);
 				startall = 1;
 			}
 		} else {
@@ -3134,7 +3134,7 @@ urtwn_scan_end(struct ieee80211com *ic)
 static void
 urtwn_set_channel(struct ieee80211com *ic)
 {
-	struct urtwn_softc *sc = ic->ic_ifp->if_softc;
+	struct urtwn_softc *sc = ic->ic_softc;
 	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
 
 	URTWN_LOCK(sc);
@@ -3524,7 +3524,7 @@ urtwn_raw_xmit(struct ieee80211_node *ni
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	struct ifnet *ifp = ic->ic_ifp;
-	struct urtwn_softc *sc = ifp->if_softc;
+	struct urtwn_softc *sc = ic->ic_softc;
 	struct urtwn_data *bf;
 
 	/* prevent management frames from being sent if we're not ready */