---

yaml --- r: 309511 b: refs/heads/master c: c26a0e1 h: refs/heads/master i: 309509: e1b1900 309507: eb1d8ec 309503: 566e2eb v: v3
git-mirror · May 29, 2012 · 52f88f5 · 52f88f5
1 parent 93c599f
commit 52f88f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfc441a4bbe9b7a56d3611cc14c98cce3a573565
+refs/heads/master: c26a0e105cf11fa482116cc59a7c6cd9c01dd61b
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
@@ -153,7 +153,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
 
 	/* Don't calculate ACKs for QoS Frames with NoAck Policy set */
 	if (ieee80211_is_data_qos(hdr->frame_control) &&
-	    *(ieee80211_get_qos_ctl(hdr)) | IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
+	    *(ieee80211_get_qos_ctl(hdr)) & IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
 		dur = 0;
 	else
 		/* Time needed to transmit ACK