From patchwork Wed Aug 21 13:48:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: voncken X-Patchwork-Id: 2847925 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 259D19F271 for ; Wed, 21 Aug 2013 21:29:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E253C20570 for ; Wed, 21 Aug 2013 21:29:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 881532056A for ; Wed, 21 Aug 2013 21:28:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752665Ab3HUV26 (ORCPT ); Wed, 21 Aug 2013 17:28:58 -0400 Received: from smtp-out06.msg.oleane.net ([62.161.7.4]:59633 "EHLO smtp-out06.msg.oleane.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752477Ab3HUV25 (ORCPT ); Wed, 21 Aug 2013 17:28:57 -0400 X-Greylist: delayed 26360 seconds by postgrey-1.27 at vger.kernel.org; Wed, 21 Aug 2013 17:28:57 EDT Received: from smtp02.msg.oleane.net (smtp02.mail.priv [172.17.20.111]) by smtp-out06.msg.oleane.net with ESMTP id r7LE9aq3018875 for ; Wed, 21 Aug 2013 16:09:36 +0200 Received: from acksys.fr ([195.6.104.67]) (authenticated) by smtp02.msg.oleane.net (MTA) with ESMTP id r7LDmxtK019252; Wed, 21 Aug 2013 15:48:59 +0200 Received: from localhost.localdomain ([192.168.1.29]) by acksys.fr with Microsoft SMTPSVC(6.0.3790.4675); Wed, 21 Aug 2013 15:49:46 +0200 From: cedric.voncken@acksys.fr To: johannes@sipsolutions.net, linux-wireless@vger.kernel.org Cc: cedric Voncken Subject: [PATCH V3] cfg80211: vlan priority handling in WMM Date: Wed, 21 Aug 2013 15:48:37 +0200 Message-Id: <1377092917-23411-1-git-send-email-cedric.voncken@acksys.fr> X-Mailer: git-send-email 1.7.2.5 X-OriginalArrivalTime: 21 Aug 2013 13:49:46.0937 (UTC) FILETIME=[4C55B290:01CE9E75] X-PMX-Spam: Probability=8% X-PFSI-Info: PMX 5.6.0.2009776, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.8.21.133922 (no antivirus check) X-Orange-Auth: bWMxNDg4LTg= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-9.7 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 From: cedric Voncken If the VLAN tci is set in skb->vlan_tci use the priority field to determine the WMM priority. Signed-off-by: cedric Voncken --- net/wireless/util.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) V2 modifications: Fix indentation Use symbolic constant include the header linux/if_vlan.h V3 modifications: Check the vlan_tci validity with macro vlan_tx_tag_present Get the vlan_tci field value with macro vlan_tx_tag_get Request to netdev mailling list to know if the VLAN priority value 0 must be treated as no priority request. I add the Ben Hutchings reply below: IEEE 802.1q refers to the definition in 802.1d: > The user_priority parameter is the priority requested by the > originating service user. The value of this parameter is in the range > 0 through 7. > > NOTE -- The default user_priority value is 0. Values 1 through 7 form an > ordered sequence of user_priorities, with 1 being the lowest value and > 7 the highest. See 7.7.3 and Annex G (informative) for further > explanation of the use of user_priority values. So a value of 0 should be treated as no priority request, same as for an untagged frame. diff --git a/net/wireless/util.c b/net/wireless/util.c index ce090c1..9e4cac2 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" @@ -691,6 +692,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 @@ -700,6 +702,12 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb) if (skb->priority >= 256 && skb->priority <= 263) return skb->priority - 256; + if(vlan_tx_tag_present(skb)) { + vlan_priority = (vlan_tx_tag_get(skb) & 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;