From patchwork Mon Feb 17 16:56:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 3663871 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 C8ABF9F370 for ; Mon, 17 Feb 2014 16:56:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BEE2020200 for ; Mon, 17 Feb 2014 16:56:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96DAB201F7 for ; Mon, 17 Feb 2014 16:56:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753543AbaBQQ4V (ORCPT ); Mon, 17 Feb 2014 11:56:21 -0500 Received: from packetmixer.de ([79.140.42.25]:55601 "EHLO mail.mail.packetmixer.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753120AbaBQQ4U (ORCPT ); Mon, 17 Feb 2014 11:56:20 -0500 Received: from kero.packetmixer.de (unknown [IPv6:2a02:3100:2600:1801:221:ccff:fe73:b665]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.mail.packetmixer.de (Postfix) with ESMTPSA id 48F6D7107F; Mon, 17 Feb 2014 18:00:25 +0100 (CET) From: Simon Wunderlich To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-wireless@vger.kernel.org, mathias.kretschmer@fokus.fraunhofer.de, Simon Wunderlich Subject: [net-next v2 3/3] cfg80211: add MPLS and 802.21 classification Date: Mon, 17 Feb 2014 17:56:13 +0100 Message-Id: <1392656174-14791-4-git-send-email-sw@simonwunderlich.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1392656174-14791-1-git-send-email-sw@simonwunderlich.de> References: <1392656174-14791-1-git-send-email-sw@simonwunderlich.de> 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 MPLS labels may contain traffic control information, which should be evaluated and used by the wireless subsystem if present. Also check for IEEE 802.21 which is always network control traffic. Signed-off-by: Simon Wunderlich Signed-off-by: Mathias Kretschmer --- Changes to first version: * include linux/mpls.h, not the UAPI one * change __constant_htons to htons --- net/wireless/util.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/net/wireless/util.c b/net/wireless/util.c index d39c371..54956eb 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "core.h" #include "rdev-ops.h" @@ -710,6 +711,29 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb, return vlan_priority; } + if (skb_headlen(skb) >= sizeof(struct ethhdr)) { + struct ethhdr *eh = (struct ethhdr *)skb->data; + struct mpls_label_stack mpls_tmp, *mpls; + + switch (eh->h_proto) { + case htons(ETH_P_MPLS_UC): + case htons(ETH_P_MPLS_MC): + /* MPLS */ + mpls = skb_header_pointer(skb, sizeof(*eh), + sizeof(*mpls), &mpls_tmp); + if (!mpls) + break; + + return (ntohl(mpls->entry) & MPLS_LS_TC_MASK) + >> MPLS_LS_TC_SHIFT; + case htons(ETH_P_80221): + /* 802.21 is always network control traffic */ + return 7; + default: + break; + } + } + switch (skb->protocol) { case htons(ETH_P_IP): dscp = ipv4_get_dsfield(ip_hdr(skb)) & 0xfc;