PERFORCE change 139845 for review

[Sam Leffler]

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

Change 139845 by sam at sam_ebb on 2008/04/11 22:54:35

	honor dotd and doth when deciding whether a country ie should
	be included in beacon and probe response frames; this allows
	turning off 11h support but still including the country ie

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_output.c#47 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_output.c#47 (text+ko) ====

@@ -2187,7 +2187,7 @@
 		*frm++ = 2;
 		*frm++ = 0; *frm++ = 0;		/* TODO: ATIM window */
 	}
-	if (vap->iv_flags & IEEE80211_F_DOTH)
+	if (vap->iv_flags & (IEEE80211_F_DOTD|IEEE80211_F_DOTH))
 		frm = ieee80211_add_countryie(frm, ic);
 	if (vap->iv_flags & IEEE80211_F_WPA2) {
 		if (vap->iv_rsn_ie != NULL)
@@ -2470,7 +2470,7 @@
 		bo->bo_tim_len = 1;
 	}
 	bo->bo_tim_trailer = frm;
-	if (vap->iv_flags & IEEE80211_F_DOTH)
+	if (vap->iv_flags & (IEEE80211_F_DOTD|IEEE80211_F_DOTH))
 		frm = ieee80211_add_countryie(frm, ic);
 	if (vap->iv_flags & IEEE80211_F_WPA2) {
 		if (vap->iv_rsn_ie != NULL)