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

Commit d5fdd6ba authored by Brian Haley's avatar Brian Haley Committed by David S. Miller
Browse files

ipv6: Use correct data types for ICMPv6 type and code 



Change all the code that deals directly with ICMPv6 type and code
values to use u8 instead of a signed int as that's the actual data
type.

Signed-off-by: default avatarBrian Haley <brian.haley@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0cf08dcb

include/linux/icmpv6.h

+3 −3
Original line number Diff line number Diff line
@@ -175,16 +175,16 @@ struct icmp6_filter { 




extern void				icmpv6_send(struct sk_buff *skb,

						    int type, int code,

						    u8 type, u8 code,

						    __u32 info, 

						    struct net_device *dev);



extern int				icmpv6_init(void);

extern int				icmpv6_err_convert(int type, int code,

extern int				icmpv6_err_convert(u8 type, u8 code,

							   int *err);

extern void				icmpv6_cleanup(void);

extern void				icmpv6_param_prob(struct sk_buff *skb,

							  int code, int pos);

							  u8 code, int pos);



struct flowi;

struct in6_addr;

include/net/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct inet6_protocol 


	void	(*err_handler)(struct sk_buff *skb,

			       struct inet6_skb_parm *opt,

			       int type, int code, int offset,

			       u8 type, u8 code, int offset,

			       __be32 info);



	int	(*gso_send_check)(struct sk_buff *skb);

include/net/rawv6.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <net/protocol.h>



void raw6_icmp_error(struct sk_buff *, int nexthdr,

		int type, int code, int inner_offset, __be32);

		u8 type, u8 code, int inner_offset, __be32);

int raw6_local_deliver(struct sk_buff *, int);



extern int			rawv6_rcv(struct sock *sk,

include/net/xfrm.h

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

			   u8 type, u8 code, int offset, __be32 info);

	struct xfrm6_tunnel *next;

	int priority;

};

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static inline __u32 dccp_v6_init_sequence(struct sk_buff *skb) 
}



static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,

			int type, int code, int offset, __be32 info)

			u8 type, u8 code, int offset, __be32 info)

{

	struct ipv6hdr *hdr = (struct ipv6hdr *)skb->data;

	const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset);