Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp1862512rwb; Fri, 19 Aug 2022 10:37:22 -0700 (PDT) X-Google-Smtp-Source: AA6agR73f+8x/3iA3v+0VkRUAQ6TzW596eRovGbWK+xnWhru9sJKyPjkfrWqcTEtyuaQL/7i4E8j X-Received: by 2002:a63:125c:0:b0:427:a637:3414 with SMTP id 28-20020a63125c000000b00427a6373414mr7099217pgs.80.1660930641949; Fri, 19 Aug 2022 10:37:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660930641; cv=none; d=google.com; s=arc-20160816; b=pnSHT1CZyyaJVoS8yTOMNsi0QWxkbw68LvSOTlWaDU84w/k2iYuCb2jU/gtC7LtkAu k5YpgjDiWeTOs3fK63FjGpb0cxebs/Q16tBnghNa7oAL2uNg3QCLqj7wKzcxr8WVzsr8 n1tLI61ifpW/Gl072Laonp9zroe4q1p0F93/oc816PMEAIrZGRrVV5j611FB3cDqFl/1 gDLugORub77l456VXRG4cHOS+iOpaTmg+B7uVurHjk+147J8EFsoHaxEmZI92BzbdN3z /rZXI0sy5E427pip57Qpkf8b024pFWM8CIefP/HJ4IXuc4VDzOlJIhJbhHPtX/LSFw6e xL7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hkzfVKRR4AcoutfhlWQLdoqhHChZK1SonqWELRQWJG8=; b=fph4TrcYTEVFLQDc3myfFQG3nPHC+/hob9SfgQwzJLxvZQKGhU8/rOP423bPLsbag1 f0dBF4PSmNEnZf4PtYOeLRUo9LcxOlChIz3vr9UKohumstRG4yRe6y11n2vw3BDTO2oA ZTLWJvHWkn1nvOAEmT7d2x8PK5385jDuSgPrm19yccOH+mqolJdwIfgTDEoh16lpz7FM HjOFuH16fexoExbg+OgFExKr9D/jMLo89a7feRiGJMS1zf5Bg3VMfQ4Y4Aii/kWyrTNY YB3wh9cMgm0fRBvVTX51A6TkB7DoZQ550T/a5Ivw4kBEVpGnG37JUM0evHskFaUAhZEj aX6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=O7Kr7gzy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s19-20020a632c13000000b0042a55fa8f5dsi1284866pgs.395.2022.08.19.10.37.10; Fri, 19 Aug 2022 10:37:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=O7Kr7gzy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351056AbiHSQIp (ORCPT + 99 others); Fri, 19 Aug 2022 12:08:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351612AbiHSQGJ (ORCPT ); Fri, 19 Aug 2022 12:06:09 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA4F910C80C; Fri, 19 Aug 2022 08:55:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 569ADB827F8; Fri, 19 Aug 2022 15:55:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59203C433D6; Fri, 19 Aug 2022 15:55:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660924527; bh=frxGgoYrwHHi4aB9uzxcpORzALqIQCrZ8zBnomAcIM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O7Kr7gzywyDksettN3ewdiCSKxqbCVX9FsJY80Zxcg/h7zZyuyU/912LaBIKmTibW NKQWsVNKuNWp2mq2WfadpQe6aMTrxy9oJ45FMWvn5T8C0+gONdR11r4zXhqEvf7nhX rLB7obENik7DkyBn3w00stZXVcNyErafNiGtAELs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jian Shen , John Fastabend , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.10 182/545] test_bpf: fix incorrect netdev features Date: Fri, 19 Aug 2022 17:39:12 +0200 Message-Id: <20220819153837.508612900@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220819153829.135562864@linuxfoundation.org> References: <20220819153829.135562864@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jian Shen [ Upstream commit 9676feccacdb0571791c88b23e3b7ac4e7c9c457 ] The prototype of .features is netdev_features_t, it should use NETIF_F_LLTX and NETIF_F_HW_VLAN_STAG_TX, not NETIF_F_LLTX_BIT and NETIF_F_HW_VLAN_STAG_TX_BIT. Fixes: cf204a718357 ("bpf, testing: Introduce 'gso_linear_no_head_frag' skb_segment test") Signed-off-by: Jian Shen Acked-by: John Fastabend Link: https://lore.kernel.org/r/20220622135002.8263-1-shenjian15@huawei.com Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- lib/test_bpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/test_bpf.c b/lib/test_bpf.c index 4a9137c8551a..8761b9797073 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -6918,9 +6918,9 @@ static struct skb_segment_test skb_segment_tests[] __initconst = { .build_skb = build_test_skb_linear_no_head_frag, .features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_GSO | - NETIF_F_LLTX_BIT | NETIF_F_GRO | + NETIF_F_LLTX | NETIF_F_GRO | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | - NETIF_F_HW_VLAN_STAG_TX_BIT + NETIF_F_HW_VLAN_STAG_TX } }; -- 2.35.1