From owner-svn-src-projects@FreeBSD.ORG  Fri Apr 24 11:23:21 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DAB4C1065673;
	Fri, 24 Apr 2009 11:23:21 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C9D708FC1C;
	Fri, 24 Apr 2009 11:23:21 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3OBNLxk021041;
	Fri, 24 Apr 2009 11:23:21 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3OBNLPD021039;
	Fri, 24 Apr 2009 11:23:21 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904241123.n3OBNLPD021039@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 24 Apr 2009 11:23:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191463 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Apr 2009 11:23:22 -0000

Author: rpaulo
Date: Fri Apr 24 11:23:21 2009
New Revision: 191463
URL: http://svn.freebsd.org/changeset/base/191463

Log:
  Initial implementation of ieee80211_parse_meshid().
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c
  projects/mesh11s/sys/net80211/ieee80211_mesh.h

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Apr 24 11:20:15 2009	(r191462)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Apr 24 11:23:21 2009	(r191463)
@@ -370,7 +370,29 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 		break;
 	}
 }
+/*
+ * Parse a MESH ID ie on station join.
+ */
+void
+ieee80211_parse_meshid(struct ieee80211_node *ni, const uint8_t *ie)
+{
+	struct ieee80211vap *vap = ni->ni_vap;
 
+	if (vap->iv_caps & IEEE80211_C_MBSS) {
+		const struct ieee80211_meshid_ie *meshid =
+		    (const struct ieee80211_meshid_ie *)ie;
+
+		/*
+		 * Propagate capabilities based on the local
+		 * configuration and the remote station's advertised
+		 * capabilities. In particular this permits us to
+		 * enable use of QoS to disable ACK's.
+		 */
+		if ((vap->iv_flags & IEEE80211_F_WME) &&
+		    ni->ni_ies.wme_ie != NULL)
+			ni->ni_flags |= IEEE80211_NODE_QOS;
+	}
+}
 
 static int
 mesh_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq)

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Fri Apr 24 11:20:15 2009	(r191462)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Fri Apr 24 11:23:21 2009	(r191463)
@@ -291,5 +291,6 @@ struct ieee80211_meshact_ie {
 
 void	ieee80211_mesh_attach(struct ieee80211com *);
 void	ieee80211_mesh_detach(struct ieee80211com *);
+void	ieee80211_parse_meshid(struct ieee80211_node *, const uint8_t *);
 
 #endif /* !_NET80211_IEEE80211_MESH_H_ */