diff options
author | Thomas Pedersen <thomas@cozybit.com> | 2011-11-03 21:11:11 -0700 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 16:05:48 -0500 |
commit | 6cc00d545a21ed26696f3bda865ebf11eccbf2b5 (patch) | |
tree | e048b70728f9fcb8dac02b72b421c037d03c1e5d /net/mac80211/wme.c | |
parent | f3011cf9deb689bd68279c728c501a4166983c19 (diff) | |
download | op-kernel-dev-6cc00d545a21ed26696f3bda865ebf11eccbf2b5.zip op-kernel-dev-6cc00d545a21ed26696f3bda865ebf11eccbf2b5.tar.gz |
mac80211: QoS multicast frames have No Ack policy
Previously QoS multicast frames had the Normal Acknowledgment QoS
control bits set. This would cause broadcast frames to be discarded by
peers with which we have a BA session, since their sequence number would
fall outside the allowed range. Set No Ack QoS control bits on multicast
QoS frames and filter these in de-aggregation code.
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
v2: Use proper QoS Ack Policy ctl field mask (Christian)
v3: Clean up conditional (Johannes)
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wme.c')
-rw-r--r-- | net/mac80211/wme.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index d0240bb..d4f789a 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c @@ -150,7 +150,8 @@ void ieee80211_set_qos_hdr(struct ieee80211_sub_if_data *sdata, /* preserve EOSP bit */ ack_policy = *p & IEEE80211_QOS_CTL_EOSP; - if (unlikely(sdata->local->wifi_wme_noack_test)) + if (unlikely(sdata->local->wifi_wme_noack_test) || + is_multicast_ether_addr(hdr->addr1)) ack_policy |= IEEE80211_QOS_CTL_ACK_POLICY_NOACK; /* qos header is 2 bytes */ *p++ = ack_policy | tid; |