diff options
| author | monthadar <monthadar@FreeBSD.org> | 2012-06-25 11:52:26 +0000 |
|---|---|---|
| committer | monthadar <monthadar@FreeBSD.org> | 2012-06-25 11:52:26 +0000 |
| commit | 074e23479414dea921d159ba76cfb39027e9c4c9 (patch) | |
| tree | 7ddd02b7be0f0809f02d76456d022265abfc9c13 /sys/net80211 | |
| parent | 43e70d1bdef1c153e96f3df36c2411ced9d38895 (diff) | |
| download | FreeBSD-src-074e23479414dea921d159ba76cfb39027e9c4c9.zip FreeBSD-src-074e23479414dea921d159ba76cfb39027e9c4c9.tar.gz | |
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
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 5afd8a1..7430c34 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1313,9 +1313,9 @@ ieee80211_encap(struct ieee80211vap *vap, struct ieee80211_node *ni, 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; |
