diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
| commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
| tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /net/ipv6/ipcomp6.c | |
| parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/ipv6/ipcomp6.c')
| -rw-r--r-- | net/ipv6/ipcomp6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index d4cfec3f414e..00f3fadfcca7 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c | |||
| @@ -63,7 +63,7 @@ static void **ipcomp6_scratches; | |||
| 63 | static int ipcomp6_scratch_users; | 63 | static int ipcomp6_scratch_users; |
| 64 | static LIST_HEAD(ipcomp6_tfms_list); | 64 | static LIST_HEAD(ipcomp6_tfms_list); |
| 65 | 65 | ||
| 66 | static int ipcomp6_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb) | 66 | static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb) |
| 67 | { | 67 | { |
| 68 | int err = 0; | 68 | int err = 0; |
| 69 | u8 nexthdr = 0; | 69 | u8 nexthdr = 0; |