Attachment #154020 for bug #197143

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

and this patch




{
	struct ieee80211com *ic = ni->ni_ic;
	struct wpi_softc *sc = ic->ic_ifp->if_softc;
	struct wpi_node *wn = WPI_NODE(ni);

	if (wn->id >= WPI_ID_IBSS_MIN && wn->id <= WPI_ID_IBSS_MAX) {
		free_unr(sc->sc_unr, wn->id);

	const struct ieee80211_txparam *tp;
	struct ieee80211vap *vap = ni->ni_vap;
	struct ieee80211com *ic = ni->ni_ic;
	struct wpi_node *wn = WPI_NODE(ni);
	struct ieee80211_channel *chan;
	struct ieee80211_frame *wh;
	struct ieee80211_key *k = NULL;

wpi_add_node(struct wpi_softc *sc, struct ieee80211_node *ni)
{
	struct ieee80211com *ic = ni->ni_ic;
	struct wpi_node *wn = WPI_NODE(ni);
	struct wpi_node_info node;

	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);

static int
wpi_add_ibss_node(struct wpi_softc *sc, struct ieee80211_node *ni)
{
	struct wpi_node *wn = WPI_NODE(ni);

	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);


static void
wpi_del_node(struct wpi_softc *sc, struct ieee80211_node *ni)
{
	struct wpi_node *wn = WPI_NODE(ni);
	struct wpi_cmd_del_node node;
	int error;


	struct ieee80211com *ic = vap->iv_ic;
	struct ieee80211_node *ni = vap->iv_bss;
	struct wpi_softc *sc = ic->ic_ifp->if_softc;
	struct wpi_node *wn = WPI_NODE(ni);
	struct wpi_node_info node;
	uint16_t kflags;
	int error;

	struct ieee80211com *ic = vap->iv_ic;
	struct ieee80211_node *ni = vap->iv_bss;
	struct wpi_softc *sc = ic->ic_ifp->if_softc;
	struct wpi_node *wn = WPI_NODE(ni);
	struct wpi_node_info node;

	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);

Lines 96-101 Link Here

(-)sys/dev/wpi/if_wpivar.h (+1 lines)
96	struct ieee80211_node ni; /* must be the first */	96	struct ieee80211_node ni; /* must be the first */
97	uint8_t id;	97	uint8_t id;
98	};	98	};
		99	#define WPI_NODE(ni) ((struct wpi_node *)(ni))
99		100
100	struct wpi_power_sample {	101	struct wpi_power_sample {
101	uint8_t index;	102	uint8_t index;

Return to bug 197143

Lines 1530-1536 Link Here

(-)sys/dev/wpi/if_wpi.c (-7 / +7 lines)
1530	{	1530	{
1531	struct ieee80211com *ic = ni->ni_ic;	1531	struct ieee80211com *ic = ni->ni_ic;
1532	struct wpi_softc *sc = ic->ic_ifp->if_softc;	1532	struct wpi_softc *sc = ic->ic_ifp->if_softc;
1533	struct wpi_node wn = (struct wpi_node )ni;	1533	struct wpi_node *wn = WPI_NODE(ni);
1534		1534
1535	if (wn->id >= WPI_ID_IBSS_MIN && wn->id <= WPI_ID_IBSS_MAX) {	1535	if (wn->id >= WPI_ID_IBSS_MIN && wn->id <= WPI_ID_IBSS_MAX) {
1536	free_unr(sc->sc_unr, wn->id);	1536	free_unr(sc->sc_unr, wn->id);
Lines 2365-2371 Link Here
2365	const struct ieee80211_txparam *tp;	2365	const struct ieee80211_txparam *tp;
2366	struct ieee80211vap *vap = ni->ni_vap;	2366	struct ieee80211vap *vap = ni->ni_vap;
2367	struct ieee80211com *ic = ni->ni_ic;	2367	struct ieee80211com *ic = ni->ni_ic;
2368	struct wpi_node wn = (void )ni;	2368	struct wpi_node *wn = WPI_NODE(ni);
2369	struct ieee80211_channel *chan;	2369	struct ieee80211_channel *chan;
2370	struct ieee80211_frame *wh;	2370	struct ieee80211_frame *wh;
2371	struct ieee80211_key *k = NULL;	2371	struct ieee80211_key *k = NULL;
Lines 2942-2948 Link Here
2942	wpi_add_node(struct wpi_softc sc, struct ieee80211_node ni)	2942	wpi_add_node(struct wpi_softc sc, struct ieee80211_node ni)
2943	{	2943	{
2944	struct ieee80211com *ic = ni->ni_ic;	2944	struct ieee80211com *ic = ni->ni_ic;
2945	struct wpi_node wn = (void )ni;	2945	struct wpi_node *wn = WPI_NODE(ni);
2946	struct wpi_node_info node;	2946	struct wpi_node_info node;
2947		2947
2948	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);	2948	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);
Lines 2987-2993 Link Here
2987	static int	2987	static int
2988	wpi_add_ibss_node(struct wpi_softc sc, struct ieee80211_node ni)	2988	wpi_add_ibss_node(struct wpi_softc sc, struct ieee80211_node ni)
2989	{	2989	{
2990	struct wpi_node wn = (void )ni;	2990	struct wpi_node *wn = WPI_NODE(ni);
2991		2991
2992	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);	2992	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);
2993		2993
Lines 3005-3011 Link Here
3005	static void	3005	static void
3006	wpi_del_node(struct wpi_softc sc, struct ieee80211_node ni)	3006	wpi_del_node(struct wpi_softc sc, struct ieee80211_node ni)
3007	{	3007	{
3008	struct wpi_node wn = (void )ni;	3008	struct wpi_node *wn = WPI_NODE(ni);
3009	struct wpi_cmd_del_node node;	3009	struct wpi_cmd_del_node node;
3010	int error;	3010	int error;
3011		3011
Lines 4014-4020 Link Here
4014	struct ieee80211com *ic = vap->iv_ic;	4014	struct ieee80211com *ic = vap->iv_ic;
4015	struct ieee80211_node *ni = vap->iv_bss;	4015	struct ieee80211_node *ni = vap->iv_bss;
4016	struct wpi_softc *sc = ic->ic_ifp->if_softc;	4016	struct wpi_softc *sc = ic->ic_ifp->if_softc;
4017	struct wpi_node wn = (void )ni;	4017	struct wpi_node *wn = WPI_NODE(ni);
4018	struct wpi_node_info node;	4018	struct wpi_node_info node;
4019	uint16_t kflags;	4019	uint16_t kflags;
4020	int error;	4020	int error;
Lines 4067-4073 Link Here
4067	struct ieee80211com *ic = vap->iv_ic;	4067	struct ieee80211com *ic = vap->iv_ic;
4068	struct ieee80211_node *ni = vap->iv_bss;	4068	struct ieee80211_node *ni = vap->iv_bss;
4069	struct wpi_softc *sc = ic->ic_ifp->if_softc;	4069	struct wpi_softc *sc = ic->ic_ifp->if_softc;
4070	struct wpi_node wn = (void )ni;	4070	struct wpi_node *wn = WPI_NODE(ni);
4071	struct wpi_node_info node;	4071	struct wpi_node_info node;
4072		4072
4073	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);	4073	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);