diff options
| author | Claudio Pisa <claudio.pisa@uniroma2.it> | 2012-05-28 14:06:25 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-29 19:45:23 +0200 |
| commit | c26a0e105cf11fa482116cc59a7c6cd9c01dd61b (patch) | |
| tree | 265be7420091df54ba2bb79e9d8610bb1a9c5967 /net | |
| parent | ath9k_hw: apply internal regulator settings on AR933x (diff) | |
| download | linux-c26a0e105cf11fa482116cc59a7c6cd9c01dd61b.tar.xz linux-c26a0e105cf11fa482116cc59a7c6cd9c01dd61b.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 5f827a6b0d8d..847215bb2a6f 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 |