Created
February 11, 2015 07:25
-
-
Save fortran01/dd6d2ae607d04f16404d to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | |
@@ -677,11 +677,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; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment