D30813.id91048.diff
No OneTemporary
Actions

Size

799 B

Referenced Files

None

Subscribers

None

D30813.id91048.diff
View Options

	Index: sys/net80211/ieee80211_output.c
	===================================================================
	--- sys/net80211/ieee80211_output.c
	+++ sys/net80211/ieee80211_output.c
	@@ -2472,6 +2472,10 @@
	if (!alloc && len > *frmlen)
	return (ENOBUFS);

	+ /* For HW scans we usually do not pass in the SSID as IE. */
	+ if (ssidlen == -1)
	+ len -= (2 + IEEE80211_NWID_LEN);
	+
	if (alloc) {
	frm = malloc(len, M_80211_VAP, M_WAITOK \| M_ZERO);
	*frmp = frm;
	@@ -2479,10 +2483,7 @@
	} else
	frm = *frmp;

	- /* For HW scans we usually do not pass in the SSID as IE. */
	- if (ssidlen == -1)
	- len -= (2 + IEEE80211_NWID_LEN);
	- else
	+ if (ssidlen != -1)
	frm = ieee80211_add_ssid(frm, ssid, ssidlen);
	rs = ieee80211_get_suprates(ic, ic->ic_curchan);
	frm = ieee80211_add_rates(frm, rs);