Commit 0eae88f3 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: Fix various endianness glitches 



Sparse can help us find endianness bugs, but we need to make some
cleanups to be able to more easily spot real bugs.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb903bf4

net/bridge/br_multicast.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


static inline int br_ip_hash(struct net_bridge_mdb_htable *mdb, __be32 ip)

{

	return jhash_1word(mdb->secret, (u32)ip) & (mdb->max - 1);

	return jhash_1word(mdb->secret, (__force u32)ip) & (mdb->max - 1);

}



static struct net_bridge_mdb_entry *__br_mdb_ip_get(

net/bridge/br_private.h

+8 −7
Original line number Diff line number Diff line
@@ -130,19 +130,20 @@ struct net_bridge_port 
#endif

};



struct br_cpu_netstats {

	unsigned long	rx_packets;

	unsigned long	rx_bytes;

	unsigned long	tx_packets;

	unsigned long	tx_bytes;

};



struct net_bridge

{

	spinlock_t			lock;

	struct list_head		port_list;

	struct net_device		*dev;



	struct br_cpu_netstats __percpu {

		unsigned long	rx_packets;

		unsigned long	rx_bytes;

		unsigned long	tx_packets;

		unsigned long	tx_bytes;

	} *stats;



	struct br_cpu_netstats __percpu *stats;

	spinlock_t			hash_lock;

	struct hlist_head		hash[BR_HASH_SIZE];

	unsigned long			feature_mask;

net/ethernet/eth.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ int eth_rebuild_header(struct sk_buff *skb) 
	default:

		printk(KERN_DEBUG

		       "%s: unable to resolve type %X addresses.\n",

		       dev->name, (int)eth->h_proto);

		       dev->name, (__force int)eth->h_proto);



		memcpy(eth->h_source, dev->dev_addr, ETH_ALEN);

		break;

net/ipv4/af_inet.c

+4 −4
Original line number Diff line number Diff line
@@ -1323,8 +1323,8 @@ static struct sk_buff **inet_gro_receive(struct sk_buff **head, 
	if (unlikely(ip_fast_csum((u8 *)iph, iph->ihl)))

		goto out_unlock;



	id = ntohl(*(u32 *)&iph->id);

	flush = (u16)((ntohl(*(u32 *)iph) ^ skb_gro_len(skb)) | (id ^ IP_DF));

	id = ntohl(*(__be32 *)&iph->id);

	flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id ^ IP_DF));

	id >>= 16;



	for (p = *head; p; p = p->next) {
@@ -1337,8 +1337,8 @@ static struct sk_buff **inet_gro_receive(struct sk_buff **head, 


		if ((iph->protocol ^ iph2->protocol) |

		    (iph->tos ^ iph2->tos) |

		    (iph->saddr ^ iph2->saddr) |

		    (iph->daddr ^ iph2->daddr)) {

		    ((__force u32)iph->saddr ^ (__force u32)iph2->saddr) |

		    ((__force u32)iph->daddr ^ (__force u32)iph2->daddr)) {

			NAPI_GRO_CB(p)->same_flow = 0;

			continue;

		}

net/ipv4/ipmr.c

+5 −5
Original line number Diff line number Diff line
@@ -1772,10 +1772,10 @@ int ip_mr_input(struct sk_buff *skb) 


		vif = ipmr_find_vif(mrt, skb->dev);

		if (vif >= 0) {

			int err = ipmr_cache_unresolved(mrt, vif, skb);

			int err2 = ipmr_cache_unresolved(mrt, vif, skb);

			read_unlock(&mrt_lock);



			return err;

			return err2;

		}

		read_unlock(&mrt_lock);

		kfree_skb(skb);
@@ -2227,9 +2227,9 @@ static int ipmr_mfc_seq_show(struct seq_file *seq, void *v) 
		const struct ipmr_mfc_iter *it = seq->private;

		const struct mr_table *mrt = it->mrt;



		seq_printf(seq, "%08lX %08lX %-3hd",

			   (unsigned long) mfc->mfc_mcastgrp,

			   (unsigned long) mfc->mfc_origin,

		seq_printf(seq, "%08X %08X %-3hd",

			   (__force u32) mfc->mfc_mcastgrp,

			   (__force u32) mfc->mfc_origin,

			   mfc->mfc_parent);



		if (it->cache != &mrt->mfc_unres_queue) {