Attachment #154348 for bug #197143

View | Details | Raw Unified | Return to bug 197143 | Differences between

and this patch




	    M_80211_VAP, M_NOWAIT | M_ZERO);
	if (wvp == NULL)
		return NULL;
	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;



	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);

	return wvp->wv_newstate(vap, nstate, arg);
}

static void

static int
wpi_config_beacon(struct wpi_vap *wvp)
{
	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;




};

struct wpi_vap {
	struct ieee80211vap		wv_vap;

	struct wpi_buf			wv_bcbuf;
	struct ieee80211_beacon_offsets	wv_boff;

	int				(*wv_newstate)(struct ieee80211vap *,
					    enum ieee80211_state, int);
};
#define	WPI_VAP(vap)	((struct wpi_vap *)(vap))

Return to bug 197143

Lines 614-620 Link Here

(-)sys/dev/wpi/if_wpi.c (-4 / +4 lines)
614	M_80211_VAP, M_NOWAIT \| M_ZERO);	614	M_80211_VAP, M_NOWAIT \| M_ZERO);
615	if (wvp == NULL)	615	if (wvp == NULL)
616	return NULL;	616	return NULL;
617	vap = &wvp->vap;	617	vap = &wvp->wv_vap;
618	ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac);	618	ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac);
619		619
620	if (opmode == IEEE80211_M_IBSS)	620	if (opmode == IEEE80211_M_IBSS)
Lines 621-630 Link Here
621	wpi_init_beacon(wvp);	621	wpi_init_beacon(wvp);
622		622
623	/* Override with driver methods. */	623	/* Override with driver methods. */
624	wvp->newstate = vap->iv_newstate;
625	vap->iv_key_alloc = wpi_key_alloc;	624	vap->iv_key_alloc = wpi_key_alloc;
626	vap->iv_key_set = wpi_key_set;	625	vap->iv_key_set = wpi_key_set;
627	vap->iv_key_delete = wpi_key_delete;	626	vap->iv_key_delete = wpi_key_delete;
		627	wvp->wv_newstate = vap->iv_newstate;
628	vap->iv_newstate = wpi_newstate;	628	vap->iv_newstate = wpi_newstate;
629	vap->iv_update_beacon = wpi_update_beacon;	629	vap->iv_update_beacon = wpi_update_beacon;
630		630
Lines 1704-1710 Link Here
1704		1704
1705	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);	1705	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
1706		1706
1707	return wvp->newstate(vap, nstate, arg);	1707	return wvp->wv_newstate(vap, nstate, arg);
1708	}	1708	}
1709		1709
1710	static void	1710	static void
Lines 3955-3961 Link Here
3955	static int	3955	static int
3956	wpi_config_beacon(struct wpi_vap *wvp)	3956	wpi_config_beacon(struct wpi_vap *wvp)
3957	{	3957	{
3958	struct ieee80211com *ic = wvp->vap.iv_ic;	3958	struct ieee80211com *ic = wvp->wv_vap.iv_ic;
3959	struct ieee80211_beacon_offsets *bo = &wvp->wv_boff;	3959	struct ieee80211_beacon_offsets *bo = &wvp->wv_boff;
3960	struct wpi_buf *bcn = &wvp->wv_bcbuf;	3960	struct wpi_buf *bcn = &wvp->wv_bcbuf;
3961	struct wpi_softc *sc = ic->ic_ifp->if_softc;	3961	struct wpi_softc *sc = ic->ic_ifp->if_softc;

Lines 121-132 Link Here

(-)sys/dev/wpi/if_wpivar.h (-2 / +2 lines)
121	};	121	};
122		122
123	struct wpi_vap {	123	struct wpi_vap {
124	struct ieee80211vap vap;	124	struct ieee80211vap wv_vap;
125		125
126	struct wpi_buf wv_bcbuf;	126	struct wpi_buf wv_bcbuf;
127	struct ieee80211_beacon_offsets wv_boff;	127	struct ieee80211_beacon_offsets wv_boff;
128		128
129	int (newstate)(struct ieee80211vap ,	129	int (wv_newstate)(struct ieee80211vap ,
130	enum ieee80211_state, int);	130	enum ieee80211_state, int);
131	};	131	};
132	#define WPI_VAP(vap) ((struct wpi_vap *)(vap))	132	#define WPI_VAP(vap) ((struct wpi_vap *)(vap))