Skip to content

Commit df7025b

Browse files
committed
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/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 7c98817 + 160e9d2 commit df7025b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

net/ipv6/seg6.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,8 @@ int __init seg6_init(void)
551551
#endif
552552
#ifdef CONFIG_IPV6_SEG6_LWTUNNEL
553553
out_unregister_genl:
554+
#endif
555+
#if IS_ENABLED(CONFIG_IPV6_SEG6_LWTUNNEL) || IS_ENABLED(CONFIG_IPV6_SEG6_HMAC)
554556
genl_unregister_family(&seg6_genl_family);
555557
#endif
556558
out_unregister_pernet:
@@ -564,8 +566,9 @@ void seg6_exit(void)
564566
seg6_hmac_exit();
565567
#endif
566568
#ifdef CONFIG_IPV6_SEG6_LWTUNNEL
569+
seg6_local_exit();
567570
seg6_iptunnel_exit();
568571
#endif
569-
unregister_pernet_subsys(&ip6_segments_ops);
570572
genl_unregister_family(&seg6_genl_family);
573+
unregister_pernet_subsys(&ip6_segments_ops);
571574
}

0 commit comments

Comments
 (0)