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/esp4_offload.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (diff) | |
| parent | xfrm: remove get_mtu indirection from xfrm_type (diff) | |
| download | wireguard-linux-e3b60ffbc16feeb007d07b2b7d1da4304e98c1a3.tar.xz wireguard-linux-e3b60ffbc16feeb007d07b2b7d1da4304e98c1a3.zip | |
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/esp4_offload.c')
| -rw-r--r-- | net/ipv4/esp4_offload.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/esp4_offload.c b/net/ipv4/esp4_offload.c index 2e5e377f50a1..0e4a7cf6bc87 100644 --- a/net/ipv4/esp4_offload.c +++ b/net/ipv4/esp4_offload.c @@ -312,9 +312,7 @@ static int __init esp4_offload_init(void) static void __exit esp4_offload_exit(void) { - if (xfrm_unregister_type_offload(&esp_type_offload, AF_INET) < 0) - pr_info("%s: can't remove xfrm type offload\n", __func__); - + xfrm_unregister_type_offload(&esp_type_offload, AF_INET); inet_del_offload(&esp4_offload, IPPROTO_ESP); } |