[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>
This commit is contained in:
parent
8c689a6eae
commit
04ce69093f
14 changed files with 14 additions and 15 deletions
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -397,7 +397,7 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
static void ah6_err(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 ipv6hdr *iph = (struct ipv6hdr*)skb->data;
|
||||
struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+offset);
|
||||
|
|
|
@ -256,7 +256,7 @@ static u32 esp6_get_max_size(struct xfrm_state *x, int mtu)
|
|||
}
|
||||
|
||||
static void esp6_err(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 ipv6hdr *iph = (struct ipv6hdr*)skb->data;
|
||||
struct ipv6_esp_hdr *esph = (struct ipv6_esp_hdr*)(skb->data+offset);
|
||||
|
|
|
@ -555,7 +555,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
|
|||
icmpv6_xmit_unlock();
|
||||
}
|
||||
|
||||
static void icmpv6_notify(struct sk_buff *skb, int type, int code, u32 info)
|
||||
static void icmpv6_notify(struct sk_buff *skb, int type, int code, __be32 info)
|
||||
{
|
||||
struct in6_addr *saddr, *daddr;
|
||||
struct inet6_protocol *ipprot;
|
||||
|
|
|
@ -391,7 +391,7 @@ parse_tlv_tnl_enc_lim(struct sk_buff *skb, __u8 * raw)
|
|||
|
||||
static int
|
||||
ip6ip6_err(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 ipv6hdr *ipv6h = (struct ipv6hdr *) skb->data;
|
||||
struct ip6_tnl *t;
|
||||
|
|
|
@ -176,7 +176,7 @@ static int ipcomp6_output(struct xfrm_state *x, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
static void ipcomp6_err(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)
|
||||
{
|
||||
__be32 spi;
|
||||
struct ipv6hdr *iph = (struct ipv6hdr*)skb->data;
|
||||
|
|
|
@ -290,7 +290,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
|
||||
void rawv6_err(struct sock *sk, 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 inet_sock *inet = inet_sk(sk);
|
||||
struct ipv6_pinfo *np = inet6_sk(sk);
|
||||
|
|
|
@ -310,7 +310,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
|
|||
}
|
||||
|
||||
static void tcp_v6_err(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 ipv6hdr *hdr = (struct ipv6hdr*)skb->data;
|
||||
const struct tcphdr *th = (struct tcphdr *)(skb->data+offset);
|
||||
|
|
|
@ -104,7 +104,7 @@ static int tunnel6_rcv(struct sk_buff **pskb)
|
|||
}
|
||||
|
||||
static void tunnel6_err(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 *handler;
|
||||
|
||||
|
|
|
@ -238,7 +238,7 @@ static int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
|
|||
}
|
||||
|
||||
static void udpv6_err(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 ipv6_pinfo *np;
|
||||
struct ipv6hdr *hdr = (struct ipv6hdr*)skb->data;
|
||||
|
|
|
@ -265,7 +265,7 @@ static int xfrm6_tunnel_rcv(struct sk_buff *skb)
|
|||
}
|
||||
|
||||
static int xfrm6_tunnel_err(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)
|
||||
{
|
||||
/* xfrm6_tunnel native err handling */
|
||||
switch (type) {
|
||||
|
|
|
@ -84,7 +84,7 @@ static struct notifier_block sctp_inet6addr_notifier = {
|
|||
|
||||
/* ICMP error handler. */
|
||||
SCTP_STATIC void sctp_v6_err(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 inet6_dev *idev;
|
||||
struct ipv6hdr *iph = (struct ipv6hdr *)skb->data;
|
||||
|
|
Loading…
Reference in a new issue