From patchwork Sat Oct 31 11:36:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 317375 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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 73AE6C388F7 for ; Sat, 31 Oct 2020 11:48:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F8F820853 for ; Sat, 31 Oct 2020 11:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144887; bh=Shky6g4OVk/6gYK00B9yQQdG33qHJEk0/XWJz/WoXB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=E1X1poVBWmdvK5JWj/glXnCWAfsxCVeXUiYArmOSjTIOAm3GqfTzdXvxupY1qbmkZ BlWiABokYGiNjZe46ukmatWa2gDWYdhJpJxlAibR5sCyptag9/UEak61YFzcafJqib hNvUERizVjbH+LI7eWNfIibU7iavmCaIMXFcFd2Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728139AbgJaLr4 (ORCPT ); Sat, 31 Oct 2020 07:47:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:45356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728209AbgJaLov (ORCPT ); Sat, 31 Oct 2020 07:44:51 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 D8904205F4; Sat, 31 Oct 2020 11:44:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144691; bh=Shky6g4OVk/6gYK00B9yQQdG33qHJEk0/XWJz/WoXB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZnBsgfYvdYnBKW4oqaWpLKhWbAAbSpSeMX48wq19jMU9ffduGEJ9wQVxKWtk7w2h cnPUf8tmlt0xTzJa9muyGfD2PZ27LF+21v8CQpQrZldWNP3O4QOlGvSIzub62Enr+t OGqtUapNip/j9KhZueNNgbJnUf56zBiD62leb32Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guillaume Nault , Jakub Kicinski Subject: [PATCH 5.9 44/74] net/sched: act_mpls: Add softdep on mpls_gso.ko Date: Sat, 31 Oct 2020 12:36:26 +0100 Message-Id: <20201031113502.158025766@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201031113500.031279088@linuxfoundation.org> References: <20201031113500.031279088@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Guillaume Nault TCA_MPLS_ACT_PUSH and TCA_MPLS_ACT_MAC_PUSH might be used on gso packets. Such packets will thus require mpls_gso.ko for segmentation. v2: Drop dependency on CONFIG_NET_MPLS_GSO in Kconfig (from Jakub and David). Fixes: 2a2ea50870ba ("net: sched: add mpls manipulation actions to TC") Signed-off-by: Guillaume Nault Link: https://lore.kernel.org/r/1f6cab15bbd15666795061c55563aaf6a386e90e.1603708007.git.gnault@redhat.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/sched/act_mpls.c | 1 + 1 file changed, 1 insertion(+) --- a/net/sched/act_mpls.c +++ b/net/sched/act_mpls.c @@ -408,6 +408,7 @@ static void __exit mpls_cleanup_module(v module_init(mpls_init_module); module_exit(mpls_cleanup_module); +MODULE_SOFTDEP("post: mpls_gso"); MODULE_AUTHOR("Netronome Systems "); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("MPLS manipulation actions");