svn commit: r280085 - head/sys/dev/wpi

[Adrian Chadd]

Author: adrian
Date: Sun Mar 15 20:52:47 2015
New Revision: 280085
URL: https://svnweb.freebsd.org/changeset/base/280085

Log:
  Add prefixes to field names.
  
  PR:		kern/197143
  Submitted by:	Andriy Voskoboinyk <s3erios at gmail.com>

Modified:
  head/sys/dev/wpi/if_wpi.c
  head/sys/dev/wpi/if_wpivar.h

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sun Mar 15 20:51:56 2015	(r280084)
+++ head/sys/dev/wpi/if_wpi.c	Sun Mar 15 20:52:47 2015	(r280085)
@@ -614,17 +614,17 @@ wpi_vap_create(struct ieee80211com *ic, 
 	    M_80211_VAP, M_NOWAIT | M_ZERO);
 	if (wvp == NULL)
 		return NULL;
-	vap = &wvp->vap;
+	vap = &wvp->wv_vap;
 	ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac);
 
 	if (opmode == IEEE80211_M_IBSS)
 		wpi_init_beacon(wvp);
 
 	/* Override with driver methods. */
-	wvp->newstate = vap->iv_newstate;
 	vap->iv_key_alloc = wpi_key_alloc;
 	vap->iv_key_set = wpi_key_set;
 	vap->iv_key_delete = wpi_key_delete;
+	wvp->wv_newstate = vap->iv_newstate;
 	vap->iv_newstate = wpi_newstate;
 	vap->iv_update_beacon = wpi_update_beacon;
 
@@ -1704,7 +1704,7 @@ wpi_newstate(struct ieee80211vap *vap, e
 
 	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
 
-	return wvp->newstate(vap, nstate, arg);
+	return wvp->wv_newstate(vap, nstate, arg);
 }
 
 static void
@@ -3955,7 +3955,7 @@ wpi_auth(struct wpi_softc *sc, struct ie
 static int
 wpi_config_beacon(struct wpi_vap *wvp)
 {
-	struct ieee80211com *ic = wvp->vap.iv_ic;
+	struct ieee80211com *ic = wvp->wv_vap.iv_ic;
 	struct ieee80211_beacon_offsets *bo = &wvp->wv_boff;
 	struct wpi_buf *bcn = &wvp->wv_bcbuf;
 	struct wpi_softc *sc = ic->ic_ifp->if_softc;

Modified: head/sys/dev/wpi/if_wpivar.h
==============================================================================
--- head/sys/dev/wpi/if_wpivar.h	Sun Mar 15 20:51:56 2015	(r280084)
+++ head/sys/dev/wpi/if_wpivar.h	Sun Mar 15 20:52:47 2015	(r280085)
@@ -121,12 +121,12 @@ struct wpi_buf {
 };
 
 struct wpi_vap {
-	struct ieee80211vap		vap;
+	struct ieee80211vap		wv_vap;
 
 	struct wpi_buf			wv_bcbuf;
 	struct ieee80211_beacon_offsets	wv_boff;
 
-	int				(*newstate)(struct ieee80211vap *,
+	int				(*wv_newstate)(struct ieee80211vap *,
 					    enum ieee80211_state, int);
 };
 #define	WPI_VAP(vap)	((struct wpi_vap *)(vap))