From patchwork Tue Feb 11 14:56:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 3627511 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F26F8BF418 for ; Tue, 11 Feb 2014 14:56:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 335382018E for ; Tue, 11 Feb 2014 14:56:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3697220127 for ; Tue, 11 Feb 2014 14:56:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751285AbaBKO41 (ORCPT ); Tue, 11 Feb 2014 09:56:27 -0500 Received: from nbd.name ([46.4.11.11]:50539 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751015AbaBKO40 (ORCPT ); Tue, 11 Feb 2014 09:56:26 -0500 Received: by nf.lan (Postfix, from userid 501) id 1EE43683ED32; Tue, 11 Feb 2014 15:56:23 +0100 (CET) From: Felix Fietkau To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net Subject: [PATCH 3.14] mac80211: send control port protocol frames to the VO queue Date: Tue, 11 Feb 2014 15:56:23 +0100 Message-Id: <1392130583-84601-1-git-send-email-nbd@openwrt.org> X-Mailer: git-send-email 1.8.3.4 (Apple Git-47) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Improves reliability of wifi connections with WPA, since authentication frames are prioritized over normal traffic and also typically exempt from aggregation. Cc: stable@vger.kernel.org Signed-off-by: Felix Fietkau --- net/mac80211/wme.c | 6 ++++++ 1 file changed, 6 insertions(+) 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();