Commit 76ab608d authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

[NET]: Endian-annotate struct iphdr 



And fix trivial warnings that emerged.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f8ac64b

include/linux/ip.h

+5 −5
Original line number Diff line number Diff line
@@ -90,14 +90,14 @@ struct iphdr { 
#error	"Please fix <asm/byteorder.h>"

#endif

	__u8	tos;

	__u16	tot_len;

	__u16	id;

	__u16	frag_off;

	__be16	tot_len;

	__be16	id;

	__be16	frag_off;

	__u8	ttl;

	__u8	protocol;

	__u16	check;

	__u32	saddr;

	__u32	daddr;

	__be32	saddr;

	__be32	daddr;

	/*The options start here. */

};

net/ipv4/ip_fragment.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static struct ipq *ip_frag_create(unsigned hash, struct iphdr *iph, u32 user) 
 */

static inline struct ipq *ip_find(struct iphdr *iph, u32 user)

{

	__u16 id = iph->id;

	__be16 id = iph->id;

	__u32 saddr = iph->saddr;

	__u32 daddr = iph->daddr;

	__u8 protocol = iph->protocol;

net/ipv4/ip_output.c

+2 −2
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*)) 
	struct sk_buff *skb2;

	unsigned int mtu, hlen, left, len, ll_rs;

	int offset;

	int not_last_frag;

	__be16 not_last_frag;

	struct rtable *rt = (struct rtable*)skb->dst;

	int err = 0;
@@ -1180,7 +1180,7 @@ int ip_push_pending_frames(struct sock *sk) 
	struct ip_options *opt = NULL;

	struct rtable *rt = inet->cork.rt;

	struct iphdr *iph;

	int df = 0;

	__be16 df = 0;

	__u8 ttl;

	int err = 0;

net/ipv4/ipvs/ip_vs_xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
	struct net_device *tdev;		/* Device to other host */

	struct iphdr  *old_iph = skb->nh.iph;

	u8     tos = old_iph->tos;

	u16    df = old_iph->frag_off;

	__be16 df = old_iph->frag_off;

	struct iphdr  *iph;			/* Our new IP header */

	int    max_headroom;			/* The extra header space needed */

	int    mtu;