From patchwork Wed Jul 5 00:03:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roopa Prabhu X-Patchwork-Id: 784378 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3x2LgN6QcFz9s82 for ; Wed, 5 Jul 2017 10:03:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="ZHc1AzIO"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752413AbdGEADP (ORCPT ); Tue, 4 Jul 2017 20:03:15 -0400 Received: from mail-pg0-f46.google.com ([74.125.83.46]:35421 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752395AbdGEADO (ORCPT ); Tue, 4 Jul 2017 20:03:14 -0400 Received: by mail-pg0-f46.google.com with SMTP id j186so115491328pge.2 for ; Tue, 04 Jul 2017 17:03:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id; bh=4dVoDkrVv1bCLU+M8UHQtM3ojJS0fcn8wB6nkPfvWYE=; b=ZHc1AzIOITi848jFCboxLXmM6skGJoQ/agHzn1aIV4nmsadwpoqQ1Aq8+oN2hMEfru g2U1Pknn+xpq654wHUAB0shD1KpW6Mj2Mcn6oC7QOBOaaQCa2c40YIeg2mzzzaDm3RY5 qq9Lx9ApMuGlmBjIjKAt7ipnNU9KXfmQtuVX0= 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; bh=4dVoDkrVv1bCLU+M8UHQtM3ojJS0fcn8wB6nkPfvWYE=; b=QurZFQ8Et9hlI2s0wTBHCjRm/Cp2aTFAvPvnZ9WzslQ0F7DP0k+fCy9kAVs+qLahmL 44SDLHBzZBMLqN57dfvFnO0O1J/I5664YM/lRSeJ2CrRs0Vc0QLY8i36kL7eVquXS337 aCxQ3LnYsqY0m1r8i/lWPxhveoPQeDcj/YtS0n+599GxKWbR/NTOGQkzVWDAXxqyNZLd 4XDbKdVZtu7c2QpMMmwwbVRC4FKaS2JHmfS33XOvBaqmVbGkldrJJkvpJhzALnwBmxCJ nTQqM8+q28YezHCV/du8EnEyBhZDZo3XODfpthcrJqY/nJT7fiWdgv9nDd+PbT6sEn6g ZUNA== X-Gm-Message-State: AIVw112Ty1UJw7eF4cFYtz7JLfyXOVlM8xIEmVnlYQKrwOU+CRNoa1U7 wCEeNXFG4Y7HdYRu X-Received: by 10.98.252.17 with SMTP id e17mr17182552pfh.63.1499212988350; Tue, 04 Jul 2017 17:03:08 -0700 (PDT) Received: from hydra-01.mvlab.cumulusnetworks.com ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id z86sm47976451pfl.40.2017.07.04.17.03.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jul 2017 17:03:07 -0700 (PDT) From: Roopa Prabhu X-Google-Original-From: Roopa Prabhu To: davem@davemloft.net Cc: netdev@vger.kernel.org, dsahern@gmail.com, rshearma@brocade.com, nikolay@cumulusnetworks.com Subject: [PATCH net] mpls: fix rtm policy in mpls_getroute Date: Tue, 4 Jul 2017 17:03:02 -0700 Message-Id: <1499212982-12970-1-git-send-email-roopa@cumulusnetworks.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roopa Prabhu fix rtm policy name typo in mpls_getroute and also remove export of rtm_ipv4_policy Fixes: 397fc9e5cefe ("mpls: route get support") Reported-by: David S. Miller Signed-off-by: Roopa Prabhu --- David, since the rtm_ipv4_policy export is not in net yet and assuming it will soon be there, I have generated this patch against net-next, but addressed it to net. Thanks. net/ipv4/fib_frontend.c | 1 - net/mpls/af_mpls.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 1b5860f..4e678fa 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -626,7 +626,6 @@ int ip_rt_ioctl(struct net *net, unsigned int cmd, void __user *arg) [RTA_UID] = { .type = NLA_U32 }, [RTA_MARK] = { .type = NLA_U32 }, }; -EXPORT_SYMBOL_GPL(rtm_ipv4_policy); static int rtm_to_fib_config(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh, struct fib_config *cfg, diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index e17d6cd..bdcfb2d 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -2091,7 +2091,7 @@ static int mpls_getroute(struct sk_buff *in_skb, struct nlmsghdr *in_nlh, u8 n_labels; err = nlmsg_parse(in_nlh, sizeof(*rtm), tb, RTA_MAX, - rtm_ipv4_policy, extack); + rtm_mpls_policy, extack); if (err < 0) goto errout;