diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 18:58:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 18:58:58 -0400 |
| commit | fb395884576684ebb54b19b1054f4caed589d5f0 (patch) | |
| tree | c941073819d504fb967e4d107e382ec92f51ecf0 /net/ipv6/xfrm6_tunnel.c | |
| parent | 91b90475e793e84a57d956af8c52645e292badcb (diff) | |
| parent | 246955fe4c38bd706ae30e37c64892c94213775d (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/xfrm6_tunnel.c')
| -rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index ffcadd68b951..60c26c87277e 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
| @@ -466,7 +466,7 @@ static void xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
| 466 | return; | 466 | return; |
| 467 | } | 467 | } |
| 468 | 468 | ||
| 469 | static int xfrm6_tunnel_init_state(struct xfrm_state *x, void *args) | 469 | static int xfrm6_tunnel_init_state(struct xfrm_state *x) |
| 470 | { | 470 | { |
| 471 | if (!x->props.mode) | 471 | if (!x->props.mode) |
| 472 | return -EINVAL; | 472 | return -EINVAL; |