From: Claudio Pisa <claudio.pisa@uniroma2.it>
Date: Mon, 28 May 2012 12:06:25 +0000 (+0100)
Subject: mac80211: fix flag check for QoS NOACK frames
X-Git-Tag: v3.5-rc1~35^2~3^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c26a0e105cf11fa482116cc59a7c6cd9c01dd61b;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

mac80211: fix flag check for QoS NOACK frames

Signed-off-by: Claudio Pisa <claudio.pisa@uniroma2.it>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 5f827a6..847215b 100644
--- a/net/mac80211/tx.c
+++ b/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