From: Greg Kroah-Hartman Date: Wed, 18 Dec 2013 19:13:05 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.4.75~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7ede72101e3b8bcf477505fc0a14c57c3e4d564;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: mac80211-don-t-attempt-to-reorder-multicast-frames.patch --- diff --git a/queue-3.4/mac80211-don-t-attempt-to-reorder-multicast-frames.patch b/queue-3.4/mac80211-don-t-attempt-to-reorder-multicast-frames.patch new file mode 100644 index 00000000000..5840b5cfc05 --- /dev/null +++ b/queue-3.4/mac80211-don-t-attempt-to-reorder-multicast-frames.patch @@ -0,0 +1,36 @@ +From 051a41fa4ee14f5c39668f0980973b9a195de560 Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Wed, 20 Nov 2013 11:28:27 +0100 +Subject: mac80211: don't attempt to reorder multicast frames + +From: Johannes Berg + +commit 051a41fa4ee14f5c39668f0980973b9a195de560 upstream. + +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. + +Reported-by: Blaise Gassend +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman + +--- + net/mac80211/rx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -763,7 +763,8 @@ static void ieee80211_rx_reorder_ampdu(s + 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; + + /* diff --git a/queue-3.4/series b/queue-3.4/series index 6facf1ef473..2f1fb244e18 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -17,3 +17,4 @@ input-usbtouchscreen-separate-report-and-transmit-buffer-size-handling.patch drivers-rtc-rtc-at91rm9200.c-correct-alarm-over-day-month-wrap.patch selinux-handle-tcp-syn-ack-packets-correctly-in-selinux_ip_output.patch selinux-handle-tcp-syn-ack-packets-correctly-in-selinux_ip_postroute.patch +mac80211-don-t-attempt-to-reorder-multicast-frames.patch