Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04ce6909 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[IPV6]: 'info' argument of ipv6 ->err_handler() is net-endian 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8c689a6e

include/net/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/net/rawv6.h

+1 −1
Original line number Diff line number Diff line
@@ -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

include/net/xfrm.h

+1 −2
Original line number Diff line number Diff line
@@ -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;

};

net/ipv6/ah6.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/ipv6/esp6.c

+1 −1
Original line number Diff line number Diff line
@@ -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);