diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ah6.c | 2 | ||||
-rw-r--r-- | net/ipv6/esp6.c | 2 | ||||
-rw-r--r-- | net/ipv6/ipcomp6.c | 2 | ||||
-rw-r--r-- | net/ipv6/xfrm6_input.c | 2 | ||||
-rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index cf58251df4b3..6778173a3dda 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c | |||
@@ -229,7 +229,7 @@ error: | |||
229 | return err; | 229 | return err; |
230 | } | 230 | } |
231 | 231 | ||
232 | static int ah6_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb) | 232 | static int ah6_input(struct xfrm_state *x, struct sk_buff *skb) |
233 | { | 233 | { |
234 | /* | 234 | /* |
235 | * Before process AH | 235 | * Before process AH |
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 3dcaac7a0972..22f046079037 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
@@ -130,7 +130,7 @@ error: | |||
130 | return err; | 130 | return err; |
131 | } | 131 | } |
132 | 132 | ||
133 | static int esp6_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb) | 133 | static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) |
134 | { | 134 | { |
135 | struct ipv6hdr *iph; | 135 | struct ipv6hdr *iph; |
136 | struct ipv6_esp_hdr *esph; | 136 | struct ipv6_esp_hdr *esph; |
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; |
diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c index cccf8b76f046..ec7a96e9fa64 100644 --- a/net/ipv6/xfrm6_input.c +++ b/net/ipv6/xfrm6_input.c | |||
@@ -65,7 +65,7 @@ int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi) | |||
65 | if (xfrm_state_check_expire(x)) | 65 | if (xfrm_state_check_expire(x)) |
66 | goto drop_unlock; | 66 | goto drop_unlock; |
67 | 67 | ||
68 | nexthdr = x->type->input(x, &(xfrm_vec[xfrm_nr].decap), skb); | 68 | nexthdr = x->type->input(x, skb); |
69 | if (nexthdr <= 0) | 69 | if (nexthdr <= 0) |
70 | goto drop_unlock; | 70 | goto drop_unlock; |
71 | 71 | ||
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index a8f6776c518d..d37768e5064f 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
@@ -351,7 +351,7 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) | |||
351 | return 0; | 351 | return 0; |
352 | } | 352 | } |
353 | 353 | ||
354 | static int xfrm6_tunnel_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb) | 354 | static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb) |
355 | { | 355 | { |
356 | return 0; | 356 | return 0; |
357 | } | 357 | } |