From patchwork Thu Jul 4 07:18:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: voncken X-Patchwork-Id: 2822161 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 52CE79F7D6 for ; Thu, 4 Jul 2013 07:18:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2BCCC20121 for ; Thu, 4 Jul 2013 07:18:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF7252011B for ; Thu, 4 Jul 2013 07:18:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755493Ab3GDHS0 (ORCPT ); Thu, 4 Jul 2013 03:18:26 -0400 Received: from smtp26.msg.oleane.net ([62.161.4.26]:42026 "EHLO smtp26.msg.oleane.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755168Ab3GDHSZ (ORCPT ); Thu, 4 Jul 2013 03:18:25 -0400 Received: from RD8 ([195.6.104.67]) by smtp26.msg.oleane.net (MTA) with ESMTP id r647IMYm015381; Thu, 4 Jul 2013 09:18:22 +0200 X-Oleane-Rep: REPA From: "voncken" To: Cc: References: <1372319520-29087-1-git-send-email-cedric.voncken@acksys.fr> <070e01ce762c$24fa5ff0$6eef1fd0$@acksys.fr> In-Reply-To: <070e01ce762c$24fa5ff0$6eef1fd0$@acksys.fr> Subject: [PATCH V2] vlan priority handling in WMM Date: Thu, 4 Jul 2013 09:18:28 +0200 Message-ID: <00e901ce7886$ae44d360$0ace7a20$@acksys.fr> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-index: AQEiF93CkRGnxxVTGdJzqI5ANXilNgHd/7W2mp3tkXA= Content-language: fr X-PMX-Spam: Probability=8% X-PFSI-Info: PMX 5.6.0.2009776, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.7.4.70628 (no antivirus check) 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.1 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 If the VLAN tci is set in skb->vlan_tci use the priority field to determine the WMM priority. V2 modifications : Fix indentation Use symbolic constant include the header linux/if_vlan.h Signed-off-by: cedric Voncken --- net/wireless/util.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) return skb->priority - 256; + vlan_priority = (skb->vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT; + if (vlan_priority > 0) + return vlan_priority; + switch (skb->protocol) { case htons(ETH_P_IP): dscp = ipv4_get_dsfield(ip_hdr(skb)) & 0xfc; -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/wireless/util.c b/net/wireless/util.c index 74458b7..13937db 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "core.h" #include "rdev-ops.h" @@ -685,6 +686,7 @@ EXPORT_SYMBOL(ieee80211_amsdu_to_8023s); unsigned int cfg80211_classify8021d(struct sk_buff *skb) { unsigned int dscp; + unsigned char vlan_priority; /* skb->priority values from 256->263 are magic values to * directly indicate a specific 802.1d priority. This is used @@ -694,6 +696,10 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb) if (skb->priority >= 256 && skb->priority <= 263)