From owner-p4-projects@FreeBSD.ORG  Fri Apr 11 22:55:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 82A021065672; Fri, 11 Apr 2008 22:55:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 446E5106566C
	for <perforce@freebsd.org>; Fri, 11 Apr 2008 22:55:23 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C2BB8FC13
	for <perforce@freebsd.org>; Fri, 11 Apr 2008 22:55:23 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BMtN5d087077
	for <perforce@freebsd.org>; Fri, 11 Apr 2008 22:55:23 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BMtNvr087075
	for perforce@freebsd.org; Fri, 11 Apr 2008 22:55:23 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 11 Apr 2008 22:55:23 GMT
Message-Id: <200804112255.m3BMtNvr087075@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139845 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Apr 2008 22:55:23 -0000

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

Change 139845 by sam@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)