diff options
| author |  Jakub Kicinski <kuba@kernel.org>
| 2024-05-14 10:52:25 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org>
| 2024-05-14 10:53:19 -0700 |
| commit | 654de42f3fc6edc29d743c1dbcd1424f7793f63d (patch) | |
| tree | 926a117748f1789c60a9404e14da451975c21a69 /net/ipv6 | |
| parent | selftests: netfilter: fix packetdrill conntrack testcase (diff) | |
| parent | net: micrel: Fix receiving the timestamp in the frame for lan8841 (diff) | |
| download | linux-654de42f3fc6edc29d743c1dbcd1424f7793f63d.tar.gz linux-654de42f3fc6edc29d743c1dbcd1424f7793f63d.tar.bz2 linux-654de42f3fc6edc29d743c1dbcd1424f7793f63d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.10 net-next PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv6')
| -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); } |