[3.14] mac80211: send control port protocol frames to the VO queue

Commit Message

Felix Fietkau Feb. 11, 2014, 2:56 p.m. UTC

Improves reliability of wifi connections with WPA, since authentication
frames are prioritized over normal traffic and also typically exempt
from aggregation.

Cc: [e-mail]
Signed-off-by: Felix Fietkau <[e-mail]>
---
 net/mac80211/wme.c | 6 ++++++
 1 file changed, 6 insertions(+)

Patch

diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 21211c6..2656969 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -107,6 +107,7 @@  u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
 	const u8 *ra = NULL;
 	bool qos = false;
 	struct mac80211_qos_map *qos_map;
+	struct ethhdr *ehdr = (struct ethhdr *) skb->data;
 
 	if (local->hw.queues < IEEE80211_NUM_ACS || skb->len < 6) {
 		skb->priority = 0; /* required for correct WPA/11i MIC */
@@ -154,6 +155,11 @@  u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
 		return IEEE80211_AC_BE;
 	}
 
+	if (ehdr->h_proto == sdata->control_port_protocol) {
+		skb->priority = 7;
+		return ieee80211_downgrade_queue(sdata, skb);
+	}
+
 	/* use the data classifier to determine what 802.1d tag the
 	 * data frame has */
 	rcu_read_lock();