diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/ah6.c | 2 | ||||
-rw-r--r-- | net/ipv6/esp6.c | 2 | ||||
-rw-r--r-- | net/ipv6/icmp.c | 2 | ||||
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 | ||||
-rw-r--r-- | net/ipv6/ipcomp6.c | 2 | ||||
-rw-r--r-- | net/ipv6/raw.c | 2 | ||||
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 | ||||
-rw-r--r-- | net/ipv6/tunnel6.c | 2 | ||||
-rw-r--r-- | net/ipv6/udp.c | 2 | ||||
-rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 2 | ||||
-rw-r--r-- | net/sctp/ipv6.c | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index b0d83e8e4252..2d9e495cf691 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c | |||
@@ -397,7 +397,7 @@ out: | |||
397 | } | 397 | } |
398 | 398 | ||
399 | static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 399 | static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
400 | int type, int code, int offset, __u32 info) | 400 | int type, int code, int offset, __be32 info) |
401 | { | 401 | { |
402 | struct ipv6hdr *iph = (struct ipv6hdr*)skb->data; | 402 | struct ipv6hdr *iph = (struct ipv6hdr*)skb->data; |
403 | struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+offset); | 403 | struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+offset); |
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index e78680a9985b..25dcf69cd807 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
@@ -256,7 +256,7 @@ static u32 esp6_get_max_size(struct xfrm_state *x, int mtu) | |||
256 | } | 256 | } |
257 | 257 | ||
258 | static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 258 | static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
259 | int type, int code, int offset, __u32 info) | 259 | int type, int code, int offset, __be32 info) |
260 | { | 260 | { |
261 | struct ipv6hdr *iph = (struct ipv6hdr*)skb->data; | 261 | struct ipv6hdr *iph = (struct ipv6hdr*)skb->data; |
262 | struct ipv6_esp_hdr *esph = (struct ipv6_esp_hdr*)(skb->data+offset); | 262 | struct ipv6_esp_hdr *esph = (struct ipv6_esp_hdr*)(skb->data+offset); |
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 4ec876066b3f..81bd45b26c98 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -555,7 +555,7 @@ out: | |||
555 | icmpv6_xmit_unlock(); | 555 | icmpv6_xmit_unlock(); |
556 | } | 556 | } |
557 | 557 | ||
558 | static void icmpv6_notify(struct sk_buff *skb, int type, int code, u32 info) | 558 | static void icmpv6_notify(struct sk_buff *skb, int type, int code, __be32 info) |
559 | { | 559 | { |
560 | struct in6_addr *saddr, *daddr; | 560 | struct in6_addr *saddr, *daddr; |
561 | struct inet6_protocol *ipprot; | 561 | struct inet6_protocol *ipprot; |
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index b9f40290d12a..6a3026dd865a 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -391,7 +391,7 @@ parse_tlv_tnl_enc_lim(struct sk_buff *skb, __u8 * raw) | |||
391 | 391 | ||
392 | static int | 392 | static int |
393 | ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 393 | ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
394 | int type, int code, int offset, __u32 info) | 394 | int type, int code, int offset, __be32 info) |
395 | { | 395 | { |
396 | struct ipv6hdr *ipv6h = (struct ipv6hdr *) skb->data; | 396 | struct ipv6hdr *ipv6h = (struct ipv6hdr *) skb->data; |
397 | struct ip6_tnl *t; | 397 | struct ip6_tnl *t; |
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index 71f59f18ede8..511730b67e97 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c | |||
@@ -176,7 +176,7 @@ out_ok: | |||
176 | } | 176 | } |
177 | 177 | ||
178 | static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 178 | static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
179 | int type, int code, int offset, __u32 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; |
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index d6dedc4aec77..6bc66552442c 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -290,7 +290,7 @@ out: | |||
290 | 290 | ||
291 | void rawv6_err(struct sock *sk, struct sk_buff *skb, | 291 | void rawv6_err(struct sock *sk, struct sk_buff *skb, |
292 | struct inet6_skb_parm *opt, | 292 | struct inet6_skb_parm *opt, |
293 | int type, int code, int offset, u32 info) | 293 | int type, int code, int offset, __be32 info) |
294 | { | 294 | { |
295 | struct inet_sock *inet = inet_sk(sk); | 295 | struct inet_sock *inet = inet_sk(sk); |
296 | struct ipv6_pinfo *np = inet6_sk(sk); | 296 | struct ipv6_pinfo *np = inet6_sk(sk); |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 4c2a7c0cafef..eb6d145ecfd7 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -310,7 +310,7 @@ failure: | |||
310 | } | 310 | } |
311 | 311 | ||
312 | static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 312 | static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
313 | int type, int code, int offset, __u32 info) | 313 | int type, int code, int offset, __be32 info) |
314 | { | 314 | { |
315 | struct ipv6hdr *hdr = (struct ipv6hdr*)skb->data; | 315 | struct ipv6hdr *hdr = (struct ipv6hdr*)skb->data; |
316 | const struct tcphdr *th = (struct tcphdr *)(skb->data+offset); | 316 | const struct tcphdr *th = (struct tcphdr *)(skb->data+offset); |
diff --git a/net/ipv6/tunnel6.c b/net/ipv6/tunnel6.c index 0ef9a35798d1..918d07dd1219 100644 --- a/net/ipv6/tunnel6.c +++ b/net/ipv6/tunnel6.c | |||
@@ -104,7 +104,7 @@ drop: | |||
104 | } | 104 | } |
105 | 105 | ||
106 | static void tunnel6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 106 | static void tunnel6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
107 | int type, int code, int offset, __u32 info) | 107 | int type, int code, int offset, __be32 info) |
108 | { | 108 | { |
109 | struct xfrm6_tunnel *handler; | 109 | struct xfrm6_tunnel *handler; |
110 | 110 | ||
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index c83f23e51c46..886300d13a59 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -238,7 +238,7 @@ csum_copy_err: | |||
238 | } | 238 | } |
239 | 239 | ||
240 | static void udpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 240 | static void udpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
241 | int type, int code, int offset, __u32 info) | 241 | int type, int code, int offset, __be32 info) |
242 | { | 242 | { |
243 | struct ipv6_pinfo *np; | 243 | struct ipv6_pinfo *np; |
244 | struct ipv6hdr *hdr = (struct ipv6hdr*)skb->data; | 244 | struct ipv6hdr *hdr = (struct ipv6hdr*)skb->data; |
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index f26d81b6342c..01a5c52a2be3 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
@@ -265,7 +265,7 @@ static int xfrm6_tunnel_rcv(struct sk_buff *skb) | |||
265 | } | 265 | } |
266 | 266 | ||
267 | static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 267 | static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
268 | int type, int code, int offset, __u32 info) | 268 | int type, int code, int offset, __be32 info) |
269 | { | 269 | { |
270 | /* xfrm6_tunnel native err handling */ | 270 | /* xfrm6_tunnel native err handling */ |
271 | switch (type) { | 271 | switch (type) { |
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 78071c6e6cf1..3c316c688ade 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c | |||
@@ -84,7 +84,7 @@ static struct notifier_block sctp_inet6addr_notifier = { | |||
84 | 84 | ||
85 | /* ICMP error handler. */ | 85 | /* ICMP error handler. */ |
86 | SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 86 | SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
87 | int type, int code, int offset, __u32 info) | 87 | int type, int code, int offset, __be32 info) |
88 | { | 88 | { |
89 | struct inet6_dev *idev; | 89 | struct inet6_dev *idev; |
90 | struct ipv6hdr *iph = (struct ipv6hdr *)skb->data; | 90 | struct ipv6hdr *iph = (struct ipv6hdr *)skb->data; |