hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/net/ipv4/xfrm4_tunnel.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /* xfrm4_tunnel.c: Generic IP tunnel transformer.
23 *
34 * Copyright (C) 2003 David S. Miller (davem@redhat.com)
....@@ -63,14 +64,14 @@
6364 static struct xfrm_tunnel xfrm_tunnel_handler __read_mostly = {
6465 .handler = xfrm_tunnel_rcv,
6566 .err_handler = xfrm_tunnel_err,
66
- .priority = 3,
67
+ .priority = 4,
6768 };
6869
6970 #if IS_ENABLED(CONFIG_IPV6)
7071 static struct xfrm_tunnel xfrm64_tunnel_handler __read_mostly = {
7172 .handler = xfrm_tunnel_rcv,
7273 .err_handler = xfrm_tunnel_err,
73
- .priority = 2,
74
+ .priority = 3,
7475 };
7576 #endif
7677
....@@ -107,8 +108,7 @@
107108 if (xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET))
108109 pr_info("%s: can't remove xfrm handler for AF_INET\n",
109110 __func__);
110
- if (xfrm_unregister_type(&ipip_type, AF_INET) < 0)
111
- pr_info("%s: can't remove xfrm type\n", __func__);
111
+ xfrm_unregister_type(&ipip_type, AF_INET);
112112 }
113113
114114 module_init(ipip_init);