From 52f88f5692b3661dc16cc36317ea74552ac6a7d3 Mon Sep 17 00:00:00 2001 From: Claudio Pisa Date: Mon, 28 May 2012 13:06:25 +0100 Subject: [PATCH] --- yaml --- r: 309511 b: refs/heads/master c: c26a0e105cf11fa482116cc59a7c6cd9c01dd61b h: refs/heads/master i: 309509: e1b19007a2ced113738f871e805943d88b7d829e 309507: eb1d8ece94dff854dd58f855b4d7295973c81547 309503: 566e2eba9853189b4998abaa521dabd9269ed872 v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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