Thread (4 messages) 4 messages, 3 authors, 2012-05-30

Re: [PATCH] mac80211: fix flag check for QoS NOACK frames

From: Johannes Berg <johannes@sipsolutions.net>
Date: 2012-05-29 07:04:55

On Mon, 2012-05-28 at 13:06 +0100, Claudio Pisa wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Claudio Pisa <redacted>
---
 net/mac80211/tx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d67d36f..cb17497 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)
Looks right to me, I guess nobody cares about duration calculations
after all. How did you find this?!

johannes
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help