summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Nault <gnault@redhat.com>2020-10-26 11:29:45 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-01 12:47:06 +0100
commit196cec63017d61d1b81d67b3df4d9fe28b38dac4 (patch)
tree6c7d53f49d6d9ca65823d3dec948035c4e2dade8
parent50dd09c87b3104df56f0b565f91eee56e20598bd (diff)
downloadlinux-stable-196cec63017d61d1b81d67b3df4d9fe28b38dac4.tar.gz
linux-stable-196cec63017d61d1b81d67b3df4d9fe28b38dac4.tar.bz2
linux-stable-196cec63017d61d1b81d67b3df4d9fe28b38dac4.zip
net/sched: act_mpls: Add softdep on mpls_gso.ko
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>
-rw-r--r--net/sched/act_mpls.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c
index e298ec3b3c9e..ca026e2bf8d2 100644
--- a/net/sched/act_mpls.c
+++ b/net/sched/act_mpls.c
@@ -408,6 +408,7 @@ static void __exit mpls_cleanup_module(void)
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");