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

Commit 747465ef authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: fix some sparse errors 



make C=2 CF="-D__CHECK_ENDIAN__" M=net

And fix flowi4_init_output() prototype for sport

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

include/net/flow.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif, 
				      __u32 mark, __u8 tos, __u8 scope,

				      __u8 proto, __u8 flags,

				      __be32 daddr, __be32 saddr,

				      __be16 dport, __be32 sport)

				      __be16 dport, __be16 sport)

{

	fl4->flowi4_oif = oif;

	fl4->flowi4_iif = 0;

net/core/secure_seq.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr, 


	memcpy(hash, saddr, 16);

	for (i = 0; i < 4; i++)

		secret[i] = net_secret[i] + daddr[i];

		secret[i] = net_secret[i] + (__force u32)daddr[i];

	secret[4] = net_secret[4] +

		(((__force u16)sport << 16) + (__force u16)dport);

	for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)

net/ipv4/inetpeer.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int addr_compare(const struct inetpeer_addr *a, 
	for (i = 0; i < n; i++) {

		if (a->addr.a6[i] == b->addr.a6[i])

			continue;

		if (a->addr.a6[i] < b->addr.a6[i])

		if ((__force u32)a->addr.a6[i] < (__force u32)b->addr.a6[i])

			return -1;

		return 1;

	}

net/ipv4/ipconfig.c

+4 −4
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ __be32 ic_servaddr = NONE; /* Boot server IP address */ 
__be32 root_server_addr = NONE;	/* Address of NFS server */

u8 root_server_path[256] = { 0, };	/* Path to mount as root */



u32 ic_dev_xid;		/* Device under configuration */

__be32 ic_dev_xid;		/* Device under configuration */



/* vendor class identifier */

static char vendor_class_identifier[253] __initdata;
@@ -861,7 +861,7 @@ static void __init ic_do_bootp_ext(u8 *ext) 
{

	u8 servers;

	int i;

	u16 mtu;

	__be16 mtu;



#ifdef IPCONFIG_DEBUG

	u8 *c;

net/ipv4/ping.c

+14 −13
Original line number Diff line number Diff line
@@ -140,13 +140,14 @@ static void ping_v4_unhash(struct sock *sk) 
		write_lock_bh(&ping_table.lock);

		hlist_nulls_del(&sk->sk_nulls_node);

		sock_put(sk);

		isk->inet_num = isk->inet_sport = 0;

		isk->inet_num = 0;

		isk->inet_sport = 0;

		sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);

		write_unlock_bh(&ping_table.lock);

	}

}



static struct sock *ping_v4_lookup(struct net *net, u32 saddr, u32 daddr,

static struct sock *ping_v4_lookup(struct net *net, __be32 saddr, __be32 daddr,

				   u16 ident, int dif)

{

	struct hlist_nulls_head *hslot = ping_hashslot(&ping_table, net, ident);
@@ -154,15 +155,15 @@ static struct sock *ping_v4_lookup(struct net *net, u32 saddr, u32 daddr, 
	struct inet_sock *isk;

	struct hlist_nulls_node *hnode;



	pr_debug("try to find: num = %d, daddr = %ld, dif = %d\n",

			 (int)ident, (unsigned long)daddr, dif);

	pr_debug("try to find: num = %d, daddr = %pI4, dif = %d\n",

			 (int)ident, &daddr, dif);

	read_lock_bh(&ping_table.lock);



	ping_portaddr_for_each_entry(sk, hnode, hslot) {

		isk = inet_sk(sk);



		pr_debug("found: %p: num = %d, daddr = %ld, dif = %d\n", sk,

			 (int)isk->inet_num, (unsigned long)isk->inet_rcv_saddr,

		pr_debug("found: %p: num = %d, daddr = %pI4, dif = %d\n", sk,

			 (int)isk->inet_num, &isk->inet_rcv_saddr,

			 sk->sk_bound_dev_if);



		pr_debug("iterate\n");
@@ -254,7 +255,7 @@ static int ping_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
		sk, addr->sin_addr.s_addr, ntohs(addr->sin_port));



	chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);

	if (addr->sin_addr.s_addr == INADDR_ANY)

	if (addr->sin_addr.s_addr == htonl(INADDR_ANY))

		chk_addr_ret = RTN_LOCAL;



	if ((sysctl_ip_nonlocal_bind == 0 &&
@@ -278,9 +279,9 @@ static int ping_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
		goto out;

	}



	pr_debug("after bind(): num = %d, daddr = %ld, dif = %d\n",

	pr_debug("after bind(): num = %d, daddr = %pI4, dif = %d\n",

		(int)isk->inet_num,

		(unsigned long) isk->inet_rcv_saddr,

		&isk->inet_rcv_saddr,

		(int)sk->sk_bound_dev_if);



	err = 0;
@@ -407,7 +408,7 @@ out: 
struct pingfakehdr {

	struct icmphdr icmph;

	struct iovec *iov;

	u32 wcheck;

	__wsum wcheck;

};



static int ping_getfrag(void *from, char * to,
@@ -459,7 +460,7 @@ static int ping_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
	struct rtable *rt = NULL;

	struct ip_options_data opt_copy;

	int free = 0;

	u32 saddr, daddr, faddr;

	__be32 saddr, daddr, faddr;

	u8  tos;

	int err;
@@ -696,8 +697,8 @@ void ping_rcv(struct sk_buff *skb) 
	struct net *net = dev_net(skb->dev);

	struct iphdr *iph = ip_hdr(skb);

	struct icmphdr *icmph = icmp_hdr(skb);

	u32 saddr = iph->saddr;

	u32 daddr = iph->daddr;

	__be32 saddr = iph->saddr;

	__be32 daddr = iph->daddr;



	/* We assume the packet has already been checked by icmp_rcv */