From owner-svn-src-projects@FreeBSD.ORG  Fri Apr 24 13:28:26 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 19CEC1065672;
	Fri, 24 Apr 2009 13:28:26 +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 08E188FC1F;
	Fri, 24 Apr 2009 13:28:26 +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 n3ODSP65023392;
	Fri, 24 Apr 2009 13:28:25 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3ODSPqW023391;
	Fri, 24 Apr 2009 13:28:25 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904241328.n3ODSPqW023391@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 24 Apr 2009 13:28:25 +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: r191465 - 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 13:28:26 -0000

Author: rpaulo
Date: Fri Apr 24 13:28:25 2009
New Revision: 191465
URL: http://svn.freebsd.org/changeset/base/191465

Log:
  Mesh stations require QoS, so we mark ni_flags as such.
  
  Pointed out by:	sam
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Apr 24 11:34:59 2009	(r191464)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Apr 24 13:28:25 2009	(r191465)
@@ -383,14 +383,9 @@ ieee80211_parse_meshid(struct ieee80211_
 		    (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.
+		 * Mesh STAs are QoS stations, so QoS is not optional.
 		 */
-		if ((vap->iv_flags & IEEE80211_F_WME) &&
-		    ni->ni_ies.wme_ie != NULL)
-			ni->ni_flags |= IEEE80211_NODE_QOS;
+		ni->ni_flags |= IEEE80211_NODE_QOS;
 	}
 }