From patchwork Thu Sep 21 09:25:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amine Kherbouche X-Patchwork-Id: 816780 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="Q7VaTPeK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xyWSl0dnsz9t43 for ; Thu, 21 Sep 2017 19:26:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751724AbdIUJ0M (ORCPT ); Thu, 21 Sep 2017 05:26:12 -0400 Received: from mail-wr0-f174.google.com ([209.85.128.174]:45272 "EHLO mail-wr0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751786AbdIUJZ7 (ORCPT ); Thu, 21 Sep 2017 05:25:59 -0400 Received: by mail-wr0-f174.google.com with SMTP id m18so4057198wrm.2 for ; Thu, 21 Sep 2017 02:25:59 -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=kyLkxqrIPypgFJGi2HZJUwT6fF3EoCCw9Xr6WAaxRtw=; b=Q7VaTPeKv/grAuucGeumRvtK4CKoEPCdft4yZrpMK6wWWjhphOmg9EVh6jPZW7jUdo A/nfyD75dV6UchdwUgOsFXhaIX4pT5q32PZTlWUMgesASODuXQ3ammAUvYQIW7OyQGp6 +1kRTZ6XvTEJbYUoq3Y9aT/WbGYuVZaTMrB4dRMxNfJaJRtURUqIab7/qZsBlC5pxN10 qyZjVFLt76vEmAYfsiSIGmN7lU72BtUEOhBihfYAjv42cDxJvzlLcx1D2v5YK+SjkbNY XzN+C4yCdoQnmhidxRcHn81/IFT8vcSQMUNbaDCrtrPpD6sEZRsl8X9w076ieDpzCAdm Tbjw== 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=kyLkxqrIPypgFJGi2HZJUwT6fF3EoCCw9Xr6WAaxRtw=; b=Pv28qSvoOAX+MuSsYya5kznwrycK1+ag+0lXjhFCWibGuXRkFwyk96u6UmtwmpaveC AAvUjDy0acxb0B1+oSqBCf1p5h74x8AjR2wWD7iqGPuCA67VhimdQ6CYrbtMlCXNpmpj n090LUQUyfBY+AbN0g0/U9P01R7weclajtQA2KUYrEbV7II5NPsxL0TmvnGoHfhW29jm 64kvrwgP2qD7t6sB09a521h24Of+hXbu6cx/QDRy5Qxsjw76F2551oUkev3rgzfI+ZOu YZX6MEzVoUONaumwiCstes58JSKvGf/Ua9WCVXOhWloPIKTGWge1rnMzSg+yoHDu64eN 8Axw== X-Gm-Message-State: AHPjjUhi+P3tpsHIju6dPrdkwzrzTHfr2TKb6K3NAgf/udTWotFqXDuf nQAURoEEgDv+ghm9pzCLUv1bnXPX X-Google-Smtp-Source: AOwi7QBRMjKRBgFEBf5FLqXj7botvhoIZTSTaw6IxDOU/zW4Pmf72Ht+L3CbYj5D/au4sePAxUYNdw== X-Received: by 10.223.184.250 with SMTP id c55mr1257892wrg.134.1505985958225; Thu, 21 Sep 2017 02:25:58 -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 t15sm748591wrb.41.2017.09.21.02.25.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 02:25:57 -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 1/2] mpls: expose stack entry function Date: Thu, 21 Sep 2017 11:25:23 +0200 Message-Id: <1505985924-12479-2-git-send-email-amine.kherbouche@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1505985924-12479-1-git-send-email-amine.kherbouche@6wind.com> References: <1505985924-12479-1-git-send-email-amine.kherbouche@6wind.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Exposing mpls_forward() function to be able to be called from elsewhere such as MPLS over GRE in the next commit. Signed-off-by: Amine Kherbouche --- include/linux/mpls.h | 3 +++ net/mpls/af_mpls.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/linux/mpls.h b/include/linux/mpls.h index 384fb22..d5c7599 100644 --- a/include/linux/mpls.h +++ b/include/linux/mpls.h @@ -2,10 +2,13 @@ #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),