From owner-p4-projects@FreeBSD.ORG  Sat Dec  3 05:19:21 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E1A9516A423; Sat,  3 Dec 2005 05:19:20 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BCA3116A420
	for <perforce@freebsd.org>; Sat,  3 Dec 2005 05:19:20 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 78D8043D49
	for <perforce@freebsd.org>; Sat,  3 Dec 2005 05:19:19 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB35JJhm016730
	for <perforce@freebsd.org>; Sat, 3 Dec 2005 05:19:19 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB35JJB1016727
	for perforce@freebsd.org; Sat, 3 Dec 2005 05:19:19 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 3 Dec 2005 05:19:19 GMT
Message-Id: <200512030519.jB35JJB1016727@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 87684 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: Sat, 03 Dec 2005 05:19:21 -0000

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

Change 87684 by sam@sam_ebb on 2005/12/03 05:18:19

	ahdemo mode fixups:
	o set bssid on create, default to all zero's
	o setup discovered neighbors to have wme+ff's as locally
	  configured; in particular enabling wme use lets us create
	  ack-free networks trivially

Affected files ...

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

Differences ...

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

@@ -279,6 +279,11 @@
 			IEEE80211_ADDR_COPY(ni->ni_bssid, ic->ic_des_bssid);
 		else
 			ni->ni_bssid[0] |= 0x02;	/* local bit for IBSS */
+	} else if (ic->ic_opmode == IEEE80211_M_AHDEMO) {
+		if (ic->ic_flags & IEEE80211_F_DESBSSID)
+			IEEE80211_ADDR_COPY(ni->ni_bssid, ic->ic_des_bssid);
+		else
+			memset(ni->ni_bssid, 0, IEEE80211_ADDR_LEN);
 	}
 	/* 
 	 * Fix the channel and related attributes.
@@ -898,6 +903,19 @@
 		ni->ni_rates = ic->ic_bss->ni_rates;
 		if (ic->ic_newassoc != NULL)
 			ic->ic_newassoc(ni, 1);
+		if (ic->ic_opmode == IEEE80211_M_AHDEMO) {
+			/*
+			 * In adhoc demo mode there are no management
+			 * frames to use to discover neighbor capabilities,
+			 * so blindly propagate the local configuration 
+			 * so we can do interesting things (e.g. use
+			 * WME to disable ACK's).
+			 */
+			if (ic->ic_flags & IEEE80211_F_WME)
+				ni->ni_flags |= IEEE80211_NODE_QOS;
+			if (ic->ic_flags & IEEE80211_F_FF)
+				ni->ni_flags |= IEEE80211_NODE_FF;
+		}
 		/* XXX not right for 802.1x/WPA */
 		ieee80211_node_authorize(ni);
 	}