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

Commit 90bcaf7b authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[IPV6]: flowlabels are net-endian 



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

include/linux/in6.h

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ extern const struct in6_addr in6addr_loopback; 
struct sockaddr_in6 {

	unsigned short int	sin6_family;    /* AF_INET6 */

	__be16			sin6_port;      /* Transport layer port # */

	__u32			sin6_flowinfo;  /* IPv6 flow information */

	__be32			sin6_flowinfo;  /* IPv6 flow information */

	struct in6_addr		sin6_addr;      /* IPv6 address */

	__u32			sin6_scope_id;  /* scope id (new in RFC2553) */

};
@@ -72,7 +72,7 @@ struct ipv6_mreq { 
struct in6_flowlabel_req

{

	struct in6_addr	flr_dst;

	__u32	flr_label;

	__be32	flr_label;

	__u8	flr_action;

	__u8	flr_share;

	__u16	flr_flags;

include/linux/ip6_tunnel.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct ip6_tnl_parm { 
	__u8 proto;		/* tunnel protocol */

	__u8 encap_limit;	/* encapsulation limit for tunnel */

	__u8 hop_limit;		/* hop limit for tunnel */

	__u32 flowinfo;		/* traffic class and flowlabel for tunnel */

	__be32 flowinfo;	/* traffic class and flowlabel for tunnel */

	__u32 flags;		/* tunnel flags */

	struct in6_addr laddr;	/* local tunnel end-point address */

	struct in6_addr raddr;	/* remote tunnel end-point address */

include/linux/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ struct ipv6_pinfo { 
	struct in6_addr		*saddr_cache;

#endif



	__u32			flow_label;

	__be32			flow_label;

	__u32			frag_size;

	__s16			hop_limit;

	__s16			mcast_hops;

include/net/flow.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ struct flowi { 
			struct in6_addr		daddr;

			struct in6_addr		saddr;

			__u32			fwmark;

			__u32			flowlabel;

			__be32			flowlabel;

		} ip6_u;



		struct {

include/net/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct ipv6_txoptions 
struct ip6_flowlabel

{

	struct ip6_flowlabel	*next;

	u32			label;

	__be32			label;

	struct in6_addr		dst;

	struct ipv6_txoptions	*opt;

	atomic_t		users;
@@ -211,7 +211,7 @@ struct ipv6_fl_socklist 
	struct ip6_flowlabel	*fl;

};



extern struct ip6_flowlabel	*fl6_sock_lookup(struct sock *sk, u32 label);

extern struct ip6_flowlabel	*fl6_sock_lookup(struct sock *sk, __be32 label);

extern struct ipv6_txoptions	*fl6_merge_options(struct ipv6_txoptions * opt_space,

						   struct ip6_flowlabel * fl,

						   struct ipv6_txoptions * fopt);