diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-05-10 19:27:48 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-10 19:27:48 -0700 |
| commit | df7025b3226988af0deadb58277b7d87a9df18c8 (patch) | |
| tree | e8c14d0c29644dc1bf0228cb1819be5282343565 | |
| parent | 7c988176b6c16c516474f6fceebe0f055af5eb56 (diff) | |
| parent | 160e9d2752181fcf18c662e74022d77d3164cd45 (diff) | |
Merge branch 'ipv6-sr-fix-errors-during-unregister'
Hangbin Liu says:
====================
ipv6: sr: fix errors during unregister
Fix some errors in seg6 unregister path, like missing unregister functions,
incorrect unregister order, etc.
====================
Link: https://lore.kernel.org/r/20240509131812.1662197-1-liuhangbin@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/ipv6/seg6.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/seg6.c b/net/ipv6/seg6.c index 35508abd76f4..a31521e270f7 100644 --- a/net/ipv6/seg6.c +++ b/net/ipv6/seg6.c @@ -551,6 +551,8 @@ out_unregister_iptun: #endif #ifdef CONFIG_IPV6_SEG6_LWTUNNEL out_unregister_genl: +#endif +#if IS_ENABLED(CONFIG_IPV6_SEG6_LWTUNNEL) || IS_ENABLED(CONFIG_IPV6_SEG6_HMAC) genl_unregister_family(&seg6_genl_family); #endif out_unregister_pernet: @@ -564,8 +566,9 @@ void seg6_exit(void) seg6_hmac_exit(); #endif #ifdef CONFIG_IPV6_SEG6_LWTUNNEL + seg6_local_exit(); seg6_iptunnel_exit(); #endif - unregister_pernet_subsys(&ip6_segments_ops); genl_unregister_family(&seg6_genl_family); + unregister_pernet_subsys(&ip6_segments_ops); } |