diff options
| author | David S. Miller <davem@davemloft.net> | 2019-07-05 15:01:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-05 15:01:15 -0700 |
| commit | e3b60ffbc16feeb007d07b2b7d1da4304e98c1a3 (patch) | |
| tree | 2de159d2ed3f637bc5423e82a31b7e34da032e76 /net/ipv4/ipcomp.c | |
| parent | c4cde5804d512a2f8934017dbf7df642dfbdf2ad (diff) | |
| parent | c7b37c769d2a5e711106a3c793140a4f46768e04 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2019-07-05
1) A lot of work to remove indirections from the xfrm code.
From Florian Westphal.
2) Fix a WARN_ON with ipv6 that triggered because of a
forgotten break statement. From Florian Westphal.
3) Remove xfrmi_init_net, it is not needed.
From Li RongQing.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipcomp.c')
| -rw-r--r-- | net/ipv4/ipcomp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index 2f4cdcc13d53..59bfa3825810 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c @@ -186,8 +186,7 @@ static void __exit ipcomp4_fini(void) { if (xfrm4_protocol_deregister(&ipcomp4_protocol, IPPROTO_COMP) < 0) pr_info("%s: can't remove protocol\n", __func__); - if (xfrm_unregister_type(&ipcomp_type, AF_INET) < 0) - pr_info("%s: can't remove xfrm type\n", __func__); + xfrm_unregister_type(&ipcomp_type, AF_INET); } module_init(ipcomp4_init); |