diff --git a/[refs] b/[refs]
index 2590fca12269..9604ed4bbeac 100644
--- 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
index 5f827a6b0d8d..847215bb2a6f 100644
--- 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