svn commit: r191465 - projects/mesh11s/sys/net80211

[Rui Paulo]

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;
 	}
 }