From: Johannes Berg Date: Wed, 20 Nov 2013 10:28:27 +0000 (+0100) Subject: mac80211: don't attempt to reorder multicast frames X-Git-Tag: v3.13-rc4~3^2~64^2^2~7^2~6 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=051a41fa4ee14f5c39668f0980973b9a195de560;p=~emulex%2Finfiniband.git mac80211: don't attempt to reorder multicast frames Multicast frames can't be transmitted as part of an aggregation session (such a session couldn't even be set up) so don't try to reorder them. Trying to do so would cause the reorder to stop working correctly since multicast QoS frames (as transmitted by the Aruba APs this was found with) would cause sequence number confusion in the buffer. Cc: stable@vger.kernel.org Reported-by: Blaise Gassend Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index caecef870c0..2b0debb0422 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -911,7 +911,8 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx, u16 sc; u8 tid, ack_policy; - if (!ieee80211_is_data_qos(hdr->frame_control)) + if (!ieee80211_is_data_qos(hdr->frame_control) || + is_multicast_ether_addr(hdr->addr1)) goto dont_reorder; /*