From owner-p4-projects@FreeBSD.ORG  Wed May 18 00:07:23 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E1D0516A4D1; Wed, 18 May 2005 00:07:22 +0000 (GMT)
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 9E90516A4CE
	for <perforce@freebsd.org>; Wed, 18 May 2005 00:07:22 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7954B43D7F
	for <perforce@freebsd.org>; Wed, 18 May 2005 00:07:22 +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 j4I07MCN062250
	for <perforce@freebsd.org>; Wed, 18 May 2005 00:07:22 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4I07Mkf062247
	for perforce@freebsd.org; Wed, 18 May 2005 00:07:22 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 18 May 2005 00:07:22 GMT
Message-Id: <200505180007.j4I07Mkf062247@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>
Subject: PERFORCE change 77118 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 18 May 2005 00:07:23 -0000

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

Change 77118 by sam@sam_ebb on 2005/05/18 00:06:26

	propagate all capabilities other than the opmode ones when
	creating a vap; eliminates the need for IEEE80211_C_COMMON

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#11 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211.c#11 (text+ko) ====

@@ -229,6 +229,9 @@
 ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap,
 	const char name[IFNAMSIZ], int unit, int opmode)
 {
+#define	IEEE80211_C_OPMODE \
+	(IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | IEEE80211_C_AHDEMO | \
+	 IEEE80211_C_MONITOR)
 	struct ifnet *ifp;
 
 	ifp = &vap->iv_if;
@@ -246,7 +249,7 @@
 
 	vap->iv_ic = ic;
 	vap->iv_flags = ic->ic_flags;		/* propagate common flags */
-	vap->iv_caps = ic->ic_caps & IEEE80211_C_COMMON;
+	vap->iv_caps = ic->ic_caps &~ IEEE80211_C_OPMODE;
 	vap->iv_opmode = opmode;
 	switch (opmode) {
 	case IEEE80211_M_STA:
@@ -300,6 +303,7 @@
 	ieee80211_sysctl_vattach(vap);
 
 	return 1;
+#undef IEEE80211_C_OPMODE
 }
 
 int