From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02DC6C43219 for ; Sat, 4 May 2019 10:25:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C887B20862 for ; Sat, 4 May 2019 10:25:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556965556; bh=tR+MRprfOBngS7bSmtpEByqIvAYApqoBHZdstMOPoAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FFymqY6E1lV3xgqXc6sSQGCXehiEbwtAckftVrbH1yuuEcJ8fnfi8eudq8E8NyduS KMCgQ4cG2COqoJwMdtHuS66mIpyAQNbGQOTXXxNvGX1VMyu7v36z/tjOhrbOpseTVy THBTW+AOACbH2W1aEcnPcc7kIgF5Fm1nAScGkM3M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727482AbfEDKZz (ORCPT ); Sat, 4 May 2019 06:25:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:35218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727448AbfEDKZy (ORCPT ); Sat, 4 May 2019 06:25:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 23E4D20870; Sat, 4 May 2019 10:25:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556965553; bh=tR+MRprfOBngS7bSmtpEByqIvAYApqoBHZdstMOPoAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wf/fMFHoc/lmFaju3JHgEmq8o4hbFBdnTyBdgDmP2DF56XN+wLjAprWK5jrPq1DC9 +KmC3Fw3TODIw7fLQ2yOU6jPMs4oRmgGg7/Sks6P5Rh6f/H0ycXHD63pRjk9bOHANP SrflWHU7/iZpi1DxM1QIrKEO9KTsY1RlJ5ARa+5w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Ahern , "David S. Miller" Subject: [PATCH 5.0 16/32] selftests: fib_rule_tests: Fix icmp proto with ipv6 Date: Sat, 4 May 2019 12:25:01 +0200 Message-Id: <20190504102453.021845546@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190504102452.523724210@linuxfoundation.org> References: <20190504102452.523724210@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Ahern [ Upstream commit 15d55bae4e3c43cd9f87fd93c73a263e172d34e1 ] A recent commit returns an error if icmp is used as the ip-proto for IPv6 fib rules. Update fib_rule_tests to send ipv6-icmp instead of icmp. Fixes: 5e1a99eae8499 ("ipv4: Add ICMPv6 support when parse route ipproto") Signed-off-by: David Ahern Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/net/fib_rule_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/tools/testing/selftests/net/fib_rule_tests.sh +++ b/tools/testing/selftests/net/fib_rule_tests.sh @@ -148,8 +148,8 @@ fib_rule6_test() fib_check_iproute_support "ipproto" "ipproto" if [ $? -eq 0 ]; then - match="ipproto icmp" - fib_rule6_test_match_n_redirect "$match" "$match" "ipproto icmp match" + match="ipproto ipv6-icmp" + fib_rule6_test_match_n_redirect "$match" "$match" "ipproto ipv6-icmp match" fi }