diff mbox series

[5.9,44/74] net/sched: act_mpls: Add softdep on mpls_gso.ko

Message ID	20201031113502.158025766@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=L2bx=EG=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Guillaume Nault <gnault@redhat.com>, Jakub Kicinski <kuba@kernel.org> 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> In-Reply-To: <20201031113500.031279088@linuxfoundation.org> References: <20201031113500.031279088@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.9,04/74] io_uring: move dropping of files into separate helper [5.9,05/74] io_uring: stash ctx task reference for SQPOLL [5.9,06/74] io_uring: unconditionally grab req->task [5.9,08/74] io_uring: enable task/files specific overflow flushing [5.9,10/74] io_uring: reference ->nsproxy for file table commands [5.9,14/74] io_uring: Fix use of XArray in __io_uring_files_cancel [5.9,16/74] io_uring: Convert advanced XArray uses to the normal API [5.9,18/74] efi/arm64: libstub: Deal gracefully with EFI_RNG_PROTOCOL failure [5.9,19/74] fs/kernel_read_file: Remove FIRMWARE_EFI_EMBEDDED enum [5.9,22/74] arm64: link with -z norelro regardless of CONFIG_RELOCATABLE [5.9,25/74] x86/copy_mc: Introduce copy_mc_enhanced_fast_string() [5.9,28/74] bnxt_en: Fix regression in workqueue cleanup logic in bnxt_remove_one(). [5.9,29/74] bnxt_en: Invoke cancel_delayed_work_sync() for PFs also. [5.9,30/74] bnxt_en: Re-write PCI BARs after PCI fatal error. [5.9,32/74] chelsio/chtls: fix deadlock issue [5.9,34/74] chelsio/chtls: fix tls record info to user [5.9,35/74] cxgb4: set up filter action after rewrites [5.9,38/74] ibmvnic: fix ibmvnic_set_mac [5.9,39/74] mlxsw: core: Fix memory leak on module removal [5.9,40/74] mlxsw: Only advertise link modes supported by both driver and device [5.9,43/74] net: ipa: command payloads already mapped [5.9,44/74] net/sched: act_mpls: Add softdep on mpls_gso.ko [5.9,48/74] tipc: fix memory leak caused by tipc_buf_append() [5.9,49/74] net/smc: fix invalid return code in smcd_new_buf_create() [5.9,50/74] net/smc: fix suppressed return code [5.9,51/74] net: protect tcf_block_unbind with block lock [5.9,53/74] arch/x86/amd/ibs: Fix re-arming IBS Fetch [5.9,55/74] x86/xen: disable Firmware First mode for correctable memory errors [5.9,57/74] ata: ahci: mvebu: Make SATA PHY optional for Armada 3720 [5.9,60/74] evm: Check size of security.evm before using it [5.9,61/74] p54: avoid accessing the data mapped to streaming DMA [5.9,63/74] RDMA/addr: Fix race with netevent_callback()/rdma_addr_cancel() [5.9,64/74] mtd: lpddr: Fix bad logic in print_drs_error [5.9,65/74] drm/i915/gem: Serialise debugfs i915_gem_objects with ctx->mutex [5.9,68/74] PM: runtime: Fix timer_expires data type on 32-bit arches [5.9,70/74] mm: mark async iocb read as NOWAIT once some data has been copied [5.9,73/74] misc: rtsx: do not setting OC_POWER_DOWN reg in rtsx_pci_init_ocp()

Commit Message

Greg Kroah-Hartman Oct. 31, 2020, 11:36 a.m. UTC

From: Guillaume Nault <gnault@redhat.com>

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 <gnault@redhat.com>
Link: https://lore.kernel.org/r/1f6cab15bbd15666795061c55563aaf6a386e90e.1603708007.git.gnault@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/sched/act_mpls.c |    1 +
 1 file changed, 1 insertion(+)

diff mbox series

Patch

--- 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 <oss-drivers@netronome.com>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("MPLS manipulation actions");