.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-or-later |
---|
1 | 2 | /* |
---|
2 | 3 | * IP Payload Compression Protocol (IPComp) for IPv6 - RFC3173 |
---|
3 | 4 | * |
---|
4 | 5 | * Copyright (C)2003 USAGI/WIDE Project |
---|
5 | 6 | * |
---|
6 | 7 | * Author Mitsuru KANDA <mk@linux-ipv6.org> |
---|
7 | | - * |
---|
8 | | - * This program is free software; you can redistribute it and/or modify |
---|
9 | | - * it under the terms of the GNU General Public License as published by |
---|
10 | | - * the Free Software Foundation; either version 2 of the License, or |
---|
11 | | - * (at your option) any later version. |
---|
12 | | - * |
---|
13 | | - * This program is distributed in the hope that it will be useful, |
---|
14 | | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
15 | | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
16 | | - * GNU General Public License for more details. |
---|
17 | | - * |
---|
18 | | - * You should have received a copy of the GNU General Public License |
---|
19 | | - * along with this program; if not, see <http://www.gnu.org/licenses/>. |
---|
20 | 8 | */ |
---|
21 | 9 | /* |
---|
22 | 10 | * [Memo] |
---|
.. | .. |
---|
103 | 91 | t->props.mode = x->props.mode; |
---|
104 | 92 | memcpy(t->props.saddr.a6, x->props.saddr.a6, sizeof(struct in6_addr)); |
---|
105 | 93 | memcpy(&t->mark, &x->mark, sizeof(t->mark)); |
---|
| 94 | + t->if_id = x->if_id; |
---|
106 | 95 | |
---|
107 | 96 | if (xfrm_init_state(t)) |
---|
108 | 97 | goto error; |
---|
.. | .. |
---|
195 | 184 | |
---|
196 | 185 | static struct xfrm6_protocol ipcomp6_protocol = { |
---|
197 | 186 | .handler = xfrm6_rcv, |
---|
| 187 | + .input_handler = xfrm_input, |
---|
198 | 188 | .cb_handler = ipcomp6_rcv_cb, |
---|
199 | 189 | .err_handler = ipcomp6_err, |
---|
200 | 190 | .priority = 0, |
---|
.. | .. |
---|
218 | 208 | { |
---|
219 | 209 | if (xfrm6_protocol_deregister(&ipcomp6_protocol, IPPROTO_COMP) < 0) |
---|
220 | 210 | pr_info("%s: can't remove protocol\n", __func__); |
---|
221 | | - if (xfrm_unregister_type(&ipcomp6_type, AF_INET6) < 0) |
---|
222 | | - pr_info("%s: can't remove xfrm type\n", __func__); |
---|
| 211 | + xfrm_unregister_type(&ipcomp6_type, AF_INET6); |
---|
223 | 212 | } |
---|
224 | 213 | |
---|
225 | 214 | module_init(ipcomp6_init); |
---|