summarylogtreecommitdiffstats
path: root/50-1-mac80211.compat08082009.wl_frag+ack_v1.patch
diff options
context:
space:
mode:
Diffstat (limited to '50-1-mac80211.compat08082009.wl_frag+ack_v1.patch')
-rw-r--r--50-1-mac80211.compat08082009.wl_frag+ack_v1.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/50-1-mac80211.compat08082009.wl_frag+ack_v1.patch b/50-1-mac80211.compat08082009.wl_frag+ack_v1.patch
new file mode 100644
index 000000000000..f9a26d463857
--- /dev/null
+++ b/50-1-mac80211.compat08082009.wl_frag+ack_v1.patch
@@ -0,0 +1,27 @@
+diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
+index 0855cac..221bed6 100644
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -780,11 +780,19 @@ int tid;
+
+ /*
+ * Packet injection may want to control the sequence
+- * number, if we have no matching interface then we
+- * neither assign one ourselves nor ask the driver to.
++ * number, so if an injected packet is found, skip
++ * renumbering it. Also make the packet NO_ACK to avoid
++ * excessive retries (ACKing and retrying should be
++ * handled by the injecting application).
++ * FIXME This may break hostapd and some other injectors.
++ * This should be done using a radiotap flag.
+ */
+- if (unlikely(info->control.vif->type == NL80211_IFTYPE_MONITOR))
++ if (unlikely((info->flags & IEEE80211_TX_CTL_INJECTED) &&
++ !(tx->sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES))) {
++ if (!ieee80211_has_morefrags(hdr->frame_control))
++ info->flags |= IEEE80211_TX_CTL_NO_ACK;
+ return TX_CONTINUE;
++ }
+
+ if (unlikely(ieee80211_is_ctl(hdr->frame_control)))
+ return TX_CONTINUE;