svn commit: r237561 - head/sys/net80211

[Monthadar Al Jaberi]

Author: monthadar
Date: Mon Jun 25 11:52:26 2012
New Revision: 237561
URL: http://svn.freebsd.org/changeset/base/237561

Log:
  Mesh mode, potential garbage in QoS subfield.
  
  * qos[1] subfield is never assigned a value before this statement.
  qos[1] can potentially be OR:ed with garbage. Make it an assignment instead;
  * Remove brackets around if statement;
  
  Approved by: adrian

Modified:
  head/sys/net80211/ieee80211_output.c

Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c	Mon Jun 25 09:46:06 2012	(r237560)
+++ head/sys/net80211/ieee80211_output.c	Mon Jun 25 11:52:26 2012	(r237561)
@@ -1313,9 +1313,9 @@ ieee80211_encap(struct ieee80211vap *vap
 		if (ic->ic_wme.wme_wmeChanParams.cap_wmeParams[ac].wmep_noackPolicy)
 			qos[0] |= IEEE80211_QOS_ACKPOLICY_NOACK;
 #ifdef IEEE80211_SUPPORT_MESH
-		if (vap->iv_opmode == IEEE80211_M_MBSS) {
-			qos[1] |= IEEE80211_QOS_MC;
-		} else
+		if (vap->iv_opmode == IEEE80211_M_MBSS)
+			qos[1] = IEEE80211_QOS_MC;
+		else
 #endif
 			qos[1] = 0;
 		wh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_QOS;