From patchwork Thu Sep 28 16:34:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amine Kherbouche X-Patchwork-Id: 819679 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="MOhohRyA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y30fY637qz9t3R for ; Fri, 29 Sep 2017 02:35:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752291AbdI1QfP (ORCPT ); Thu, 28 Sep 2017 12:35:15 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:53529 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751963AbdI1QfI (ORCPT ); Thu, 28 Sep 2017 12:35:08 -0400 Received: by mail-wm0-f54.google.com with SMTP id q132so3425538wmd.2 for ; Thu, 28 Sep 2017 09:35:07 -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=MOhohRyANZb+u5f33R5ZVsoCiTvjvWQnFnRMzlMA29Jcdqtc8QDihVjrBKQNM1Cmi9 e8pcZEKibibZRw/pWNTIesLTlgg9Yfxu2P6S7iOO9qSNsNpSB5k4NKFc3XqYmggKD3Dh b5x+a0BY3qy+PCvZkgKgRFRp8B3PKGF328yBKXGTucl3rCt3etkqof9Utxs2hCLGAu7H QSO4TVUVG6RWv2zDflZr7maZO1YKL7MBmulD9hiUhF8+Jvt9l7n9PrMc9cNfR9kVNTDh tjN7NKw/iwMeOYuXs1Z68aIP0XEV4Go4kZjKr/aYgWHVurqhIgrX+Irw0QHdR13UvuZ7 TVkA== 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=e5pa9VeCaU/IYTr4k5TN1e3rFf/w3Wb5PIUEHc3mT6kRspAz3+Vbndfi7mKQWY7mf7 jgNJGXxb9HjzYvo5ZHBZVNffD+wfMwloiYdV0YfDIgxohU3vEoWvRYDkRAyQYMWFMhPS rH5aARqlZthtVxx+JfQbfOd3Q+2wRaHrLGgsA24QZ/Itv+FmrJ5ZC9+uFftzv5AyRRIL WkjgSyFFxz6UgS9INByIlK06JXZoPxq9ugG0F7eaw9Sy425sZYFhkbyGkYLDRdE84yqh tq0hygCwSoUQL44lrr+TGvPYDB8V+wwF1T7t1rXf9LUGkmD7WRBioVFN9WUdswYQ1DT+ HlOA== X-Gm-Message-State: AHPjjUjka+TImFjoNLLPhNmbohwkJiC8MTzx8RjmddGSIOTP0crMOSlY f3EouFPPHsyKIu5Hy6gez1mkVT37 X-Google-Smtp-Source: AOwi7QBfw6SghIn1BGcDCU7UmbOsnMKg8Ov0bJwZlHg07YnB5RgHd9zuyNLsEBcqJzr6c5SVZ+24Mg== X-Received: by 10.80.220.202 with SMTP id v10mr6456881edk.226.1506616506881; Thu, 28 Sep 2017 09:35:06 -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 r30sm1745488edb.59.2017.09.28.09.35.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Sep 2017 09:35:06 -0700 (PDT) From: Amine Kherbouche To: netdev@vger.kernel.org, davem@davemloft.net, xeb@mail.ru, roopa@cumulusnetworks.com Cc: amine.kherbouche@6wind.com, equinox@diac24.net Subject: [PATCH v5 1/2] mpls: export mpls_forward() Date: Thu, 28 Sep 2017 18:34:38 +0200 Message-Id: <1c741aad9bd9516d99a46192f561125d18b28fa4.1506616215.git.amine.kherbouche@6wind.com> 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),