Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2815385rwb; Mon, 15 Aug 2022 11:55:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR76xEoFfLqbqWjcm3O2kgFk+/IkyTy+FEcrr47pCHs5mZk5sAE1Lqm8eYEMgpYrXw+eQvm3 X-Received: by 2002:a05:6402:5289:b0:43b:69a9:38c8 with SMTP id en9-20020a056402528900b0043b69a938c8mr16128436edb.263.1660589712922; Mon, 15 Aug 2022 11:55:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660589712; cv=none; d=google.com; s=arc-20160816; b=Cn5lR/cOanFKasVc/ZzZp6/udO50RVw+ulG4oG8ajc5vu+8VzfJPTPXDcvEUEO6LMm nm/kZ/ZN2QODRIO3k07AVcic7RtVGaOhfGnCxVPInu0U2hmocH1W++9pEdQR+YvC3/SR wwu1HSLziUnyUDsfg+dkVhIaZJr8XpP39mYvN+S5vZtGThqw0yTBqqHn4LYny0H/9SFq 6C2MvK3Rj7rNKfl6BjfPCf/gTRuDba3ye26xU/C9rmmZkXFEDaFmumGAUx7oXkIiCpON sK+mJkF+2Lby3dL9VqF0kTYq77Zy8JYXgOHAtwvuSAuN/J0wPw1fuR9caz5h4HdOso3n eEWQ== 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=DtlVlLOW5F+odsS0jqizu286fa9SxzO5L+/dBNWedKQ=; b=Eu1nV3mxUnrFvzAhp679LLwxoc+9KGUtVdUGgf93PXE1YFCqwHq25JfyzCTRkF1QW4 mLnKq6nYMNASHHXItG8+nT6EFuLoiDXOqdXwQ/uxS3QxXRajElpNUpeDM9qB9Mn1isEQ v0b+uvHZCpj3QSKvKNFfB9JqB/+RCbRa+NBP6tV0hA4h8oJbnJ1ww6psb4XvQTOJXcad Qbq0BHlg1MWA9ia769apVGS9Fghd/L9B3Etcn/lGNwKdEu2I2J7PaExDV7P2nWo9li8+ PvHZpF582UGVycThBMjTOyVT65+UAfiF6kRzPjgmY7EqnN41MvzqmqyGVABjS58idwdx 5JZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="KT/kHU47"; 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 hp26-20020a1709073e1a00b0072f66504cc1si10016053ejc.334.2022.08.15.11.54.42; Mon, 15 Aug 2022 11:55:12 -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="KT/kHU47"; 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 S244283AbiHOSup (ORCPT + 99 others); Mon, 15 Aug 2022 14:50:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243942AbiHOSqI (ORCPT ); Mon, 15 Aug 2022 14:46:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 849283135F; Mon, 15 Aug 2022 11:27:53 -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 dfw.source.kernel.org (Postfix) with ESMTPS id A6C4160EEB; Mon, 15 Aug 2022 18:27:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94D1FC433D6; Mon, 15 Aug 2022 18:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660588072; bh=r3gFHJXvMQTsie8xZMIS5wiBAkPF8wfD8WAJ2H1V96E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KT/kHU47yC9mC6wAz4WfoMX2LSvUvs5aiRI05ObHGS4VVD5C0IHKxhYHdNS+Rj87K K8BoJGDkBlVtUg/nD6xKsCUdRSlMDoKvePqGAwvZP/FQaM08gLpNFxYhp8EMkuxoj9 XR3k+kSwgGfdfSM1M9qEbbgOwop2+RlFXvuZiL6c= 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.15 285/779] test_bpf: fix incorrect netdev features Date: Mon, 15 Aug 2022 19:58:49 +0200 Message-Id: <20220815180349.484552952@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@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 68d125b409f2..84f5dd3b0fc7 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -8890,9 +8890,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