aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ipcomp6.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/ipcomp6.c')
-rw-r--r--net/ipv6/ipcomp6.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 511730b67e97..5724ba9f75de 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -9,25 +9,25 @@
9 * it under the terms of the GNU General Public License as published by 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 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 */ 21 */
22/* 22/*
23 * [Memo] 23 * [Memo]
24 * 24 *
25 * Outbound: 25 * Outbound:
26 * The compression of IP datagram MUST be done before AH/ESP processing, 26 * The compression of IP datagram MUST be done before AH/ESP processing,
27 * fragmentation, and the addition of Hop-by-Hop/Routing header. 27 * fragmentation, and the addition of Hop-by-Hop/Routing header.
28 * 28 *
29 * Inbound: 29 * Inbound:
30 * The decompression of IP datagram MUST be done after the reassembly, 30 * The decompression of IP datagram MUST be done after the reassembly,
31 * AH/ESP processing. 31 * AH/ESP processing.
32 */ 32 */
33#include <linux/module.h> 33#include <linux/module.h>
@@ -176,7 +176,7 @@ out_ok:
176} 176}
177 177
178static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 178static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
179 int type, int code, int offset, __be32 info) 179 int type, int code, int offset, __be32 info)
180{ 180{
181 __be32 spi; 181 __be32 spi;
182 struct ipv6hdr *iph = (struct ipv6hdr*)skb->data; 182 struct ipv6hdr *iph = (struct ipv6hdr*)skb->data;
@@ -422,7 +422,7 @@ static int ipcomp6_init_state(struct xfrm_state *x)
422 x->props.header_len = 0; 422 x->props.header_len = 0;
423 if (x->props.mode == XFRM_MODE_TUNNEL) 423 if (x->props.mode == XFRM_MODE_TUNNEL)
424 x->props.header_len += sizeof(struct ipv6hdr); 424 x->props.header_len += sizeof(struct ipv6hdr);
425 425
426 mutex_lock(&ipcomp6_resource_mutex); 426 mutex_lock(&ipcomp6_resource_mutex);
427 if (!ipcomp6_alloc_scratches()) 427 if (!ipcomp6_alloc_scratches())
428 goto error; 428 goto error;
@@ -455,7 +455,7 @@ error:
455 goto out; 455 goto out;
456} 456}
457 457
458static struct xfrm_type ipcomp6_type = 458static struct xfrm_type ipcomp6_type =
459{ 459{
460 .description = "IPCOMP6", 460 .description = "IPCOMP6",
461 .owner = THIS_MODULE, 461 .owner = THIS_MODULE,
@@ -467,7 +467,7 @@ static struct xfrm_type ipcomp6_type =
467 .hdr_offset = xfrm6_find_1stfragopt, 467 .hdr_offset = xfrm6_find_1stfragopt,
468}; 468};
469 469
470static struct inet6_protocol ipcomp6_protocol = 470static struct inet6_protocol ipcomp6_protocol =
471{ 471{
472 .handler = xfrm6_rcv, 472 .handler = xfrm6_rcv,
473 .err_handler = ipcomp6_err, 473 .err_handler = ipcomp6_err,
@@ -490,7 +490,7 @@ static int __init ipcomp6_init(void)
490 490
491static void __exit ipcomp6_fini(void) 491static void __exit ipcomp6_fini(void)
492{ 492{
493 if (inet6_del_protocol(&ipcomp6_protocol, IPPROTO_COMP) < 0) 493 if (inet6_del_protocol(&ipcomp6_protocol, IPPROTO_COMP) < 0)
494 printk(KERN_INFO "ipv6 ipcomp close: can't remove protocol\n"); 494 printk(KERN_INFO "ipv6 ipcomp close: can't remove protocol\n");
495 if (xfrm_unregister_type(&ipcomp6_type, AF_INET6) < 0) 495 if (xfrm_unregister_type(&ipcomp6_type, AF_INET6) < 0)
496 printk(KERN_INFO "ipv6 ipcomp close: can't remove xfrm type\n"); 496 printk(KERN_INFO "ipv6 ipcomp close: can't remove xfrm type\n");