Message ID | 6a93961e8f247ff17a83ab08375eba71308ae75d.1603469145.git.gnault@redhat.com |
---|---|
State | New |
Headers | show |
Series | mpls: fix dependencies on mpls_gso.ko | expand |
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index a3b37d88800e..b08b410c8084 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -879,6 +879,8 @@ config NET_ACT_CSUM config NET_ACT_MPLS tristate "MPLS manipulation" depends on NET_CLS_ACT + select MPLS + select NET_MPLS_GSO help Say Y here to push or pop MPLS headers. diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c index f40bf9771cb9..5c7456e5b5cf 100644 --- a/net/sched/act_mpls.c +++ b/net/sched/act_mpls.c @@ -426,6 +426,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");
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. Fixes: 2a2ea50870ba ("net: sched: add mpls manipulation actions to TC") Signed-off-by: Guillaume Nault <gnault@redhat.com> --- net/sched/Kconfig | 2 ++ net/sched/act_mpls.c | 1 + 2 files changed, 3 insertions(+)