From patchwork Thu Sep 28 09:34:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amine Kherbouche X-Patchwork-Id: 819465 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=6wind-com.20150623.gappssmtp.com header.i=@6wind-com.20150623.gappssmtp.com header.b="VOA2kwUW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y2qKN5Lp4z9t3h for ; Thu, 28 Sep 2017 19:34:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752533AbdI1Jem (ORCPT ); Thu, 28 Sep 2017 05:34:42 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:52991 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752011AbdI1Jek (ORCPT ); Thu, 28 Sep 2017 05:34:40 -0400 Received: by mail-wm0-f46.google.com with SMTP id m127so986089wmm.1 for ; Thu, 28 Sep 2017 02:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jMskhJ0utzzUjrDmmUAZZFrExKt8cQH2tbZj6VdRyRo=; b=VOA2kwUWw+Iq9v2WkE72aRaTMMPQnCnHeQnOBPpruliodMChHW3Wky9GwESCb6soz0 J6GABvVVdTFdBugV20wmHa5nazk5ONqcj3O9/JJBOu8wMGKiu1CsKOirj9pHVmxrHN9U yhk8HqMOeX2tkNzZ386keW9SXJWMMoufExCw2UKPfiObbJGKQyvnfA0pYjaB9+crq2DC 0f1CBITiM/SL4KRjXokXTzOCl980CrBnrT+W9mX2Nozs6sdMpSSDOc4zd7JsIFIshnGX +7xCQsH7Pz4UDEZhqX2YgXkt+VT+FsbaeJ7tnRsx2SX7pynh78eDCKBmRYVjIOP09b16 JFXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jMskhJ0utzzUjrDmmUAZZFrExKt8cQH2tbZj6VdRyRo=; b=b3BlSPRgJoPLAV9w0HGxKsQ6vQeKkzTIsEP4u8GBTy6aUGgyS4h/Ei9i3SeJxQh+fK 89R75fhIa5G6c0tz+/3LokwZhpvZ9vvwCAGjABDHvovpJkot0Bl0nJizE5N9V/xxuqmK sOQRHFA0y3NfGaNfQgH3gMk5LGmY+7oTaX5b9YAOsqbN61GvUPT1Ammbj29aA1Vt10OH gtuflXTveuzsl+87hH4PCXScQkBgcgrzT1I+Y24con4srrCjVTGk9NtQ0V6Liyom08cP /1Hx2d/oLQhW66WGQwvSfO8oKzX4S3YMzCNlHnrc8EzpQbBP12MiRxXp/zrlc/vLjw+6 S61Q== X-Gm-Message-State: AHPjjUi4Q8WgIZzY6fVerWySmbgZnTqu8BxFULohvWhftyWhcBI+kR7d rvCPxgVJys41tZrq1dEbl4OaDsCa X-Google-Smtp-Source: AOwi7QDH6NB9rPBr/PJMkKOYaMtPw6THqErFRfBjEbT4+1/TsAa6ldh9jAMW8IiervjUkjfp5KgRtQ== X-Received: by 10.80.212.40 with SMTP id t40mr5218240edh.67.1506591279205; Thu, 28 Sep 2017 02:34:39 -0700 (PDT) Received: from griffon.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id h56sm1453908ede.15.2017.09.28.02.34.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Sep 2017 02:34:38 -0700 (PDT) From: Amine Kherbouche To: netdev@vger.kernel.org, xeb@mail.ru, roopa@cumulusnetworks.com Cc: amine.kherbouche@6wind.com, equinox@diac24.net Subject: [PATCH v4 1/2] expose stack entry function Date: Thu, 28 Sep 2017 11:34:19 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Exporting mpls_forward() function to be able to be called from elsewhere such as MPLSoverGRE in the next commit. Signed-off-by: Amine Kherbouche Acked-by: Roopa Prabhu --- include/linux/mpls.h | 4 ++++ net/mpls/af_mpls.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/linux/mpls.h b/include/linux/mpls.h index 384fb22..b0579ab 100644 --- a/include/linux/mpls.h +++ b/include/linux/mpls.h @@ -2,10 +2,14 @@ #define _LINUX_MPLS_H #include +#include #define MPLS_TTL_MASK (MPLS_LS_TTL_MASK >> MPLS_LS_TTL_SHIFT) #define MPLS_BOS_MASK (MPLS_LS_S_MASK >> MPLS_LS_S_SHIFT) #define MPLS_TC_MASK (MPLS_LS_TC_MASK >> MPLS_LS_TC_SHIFT) #define MPLS_LABEL_MASK (MPLS_LS_LABEL_MASK >> MPLS_LS_LABEL_SHIFT) +int mpls_forward(struct sk_buff *skb, struct net_device *dev, + struct packet_type *pt, struct net_device *orig_dev); + #endif /* _LINUX_MPLS_H */ diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index c5b9ce4..36ea2ad 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -307,8 +307,8 @@ static bool mpls_egress(struct net *net, struct mpls_route *rt, return success; } -static int mpls_forward(struct sk_buff *skb, struct net_device *dev, - struct packet_type *pt, struct net_device *orig_dev) +int mpls_forward(struct sk_buff *skb, struct net_device *dev, + struct packet_type *pt, struct net_device *orig_dev) { struct net *net = dev_net(dev); struct mpls_shim_hdr *hdr; @@ -442,6 +442,7 @@ static int mpls_forward(struct sk_buff *skb, struct net_device *dev, kfree_skb(skb); return NET_RX_DROP; } +EXPORT_SYMBOL(mpls_forward); static struct packet_type mpls_packet_type __read_mostly = { .type = cpu_to_be16(ETH_P_MPLS_UC),