summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-08 00:21:01 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:21:12 -0800
commit04ce69093f91547d3a7c4fc815d2868195591340 (patch)
tree69bea18b5d1b8c2999f13f8e0372491c9f9238e6 /include/net
parent8c689a6eae2d83970e4f34753d513e96fb97a025 (diff)
downloadlinux-3.10-04ce69093f91547d3a7c4fc815d2868195591340.tar.gz
linux-3.10-04ce69093f91547d3a7c4fc815d2868195591340.tar.bz2
linux-3.10-04ce69093f91547d3a7c4fc815d2868195591340.zip
[IPV6]: 'info' argument of ipv6 ->err_handler() is net-endian
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/protocol.h2
-rw-r--r--include/net/rawv6.h2
-rw-r--r--include/net/xfrm.h3
3 files changed, 3 insertions, 4 deletions
diff --git a/include/net/protocol.h b/include/net/protocol.h
index c643bce64e5..28c4cac3f8a 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -50,7 +50,7 @@ struct inet6_protocol
void (*err_handler)(struct sk_buff *skb,
struct inet6_skb_parm *opt,
int type, int code, int offset,
- __u32 info);
+ __be32 info);
int (*gso_send_check)(struct sk_buff *skb);
struct sk_buff *(*gso_segment)(struct sk_buff *skb,
diff --git a/include/net/rawv6.h b/include/net/rawv6.h
index 14476a71725..af8960878ef 100644
--- a/include/net/rawv6.h
+++ b/include/net/rawv6.h
@@ -21,7 +21,7 @@ extern void rawv6_err(struct sock *sk,
struct sk_buff *skb,
struct inet6_skb_parm *opt,
int type, int code,
- int offset, u32 info);
+ int offset, __be32 info);
#endif
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index a63e277bacf..9d30c08b9ef 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -887,8 +887,7 @@ struct xfrm_tunnel {
struct xfrm6_tunnel {
int (*handler)(struct sk_buff *skb);
int (*err_handler)(struct sk_buff *skb, struct inet6_skb_parm *opt,
- int type, int code, int offset, __u32 info);
-
+ int type, int code, int offset, __be32 info);
struct xfrm6_tunnel *next;
int priority;
};