PERFORCE change 116505 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=116505

Change 116505 by sam at sam_ebb on 2007/03/24 21:18:23

	always set members of the beacon offsets structure; don't
	assume the caller pre-zero's it

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#71 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#71 (text+ko) ====

@@ -2034,13 +2034,15 @@
 		bo->bo_wme = frm;
 		frm = ieee80211_add_wme_param(frm, &ic->ic_wme);
 		ic->ic_flags &= ~IEEE80211_F_WMEUPDATE;
-	}
+	} else
+		bo->bo_wme = NULL;
 	if (ic->ic_flags & IEEE80211_F_WPA)
 		frm = ieee80211_add_wpa(frm, ic);
 	if (IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) {
 		bo->bo_erp = frm;
 		frm = ieee80211_add_erp(frm, ic);
-	}
+	} else
+		bo->bo_erp = NULL;
 	efrm = ieee80211_add_xrates(frm, rs);
 	bo->bo_trailer_len = efrm - bo->bo_trailer;
 	m->m_pkthdr.len = m->m_len = efrm - mtod(m, u_int8_t *);