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

[IPV4]: inet_addr_type() annotations 



argument and inferred net-endian variables in callers annotated.

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

drivers/s390/net/qeth_main.c

+1 −1
Original line number Diff line number Diff line
@@ -8067,7 +8067,7 @@ qeth_arp_constructor(struct neighbour *neigh) 
	neigh->parms = neigh_parms_clone(parms);

	rcu_read_unlock();



	neigh->type = inet_addr_type(*(u32 *) neigh->primary_key);

	neigh->type = inet_addr_type(*(__be32 *) neigh->primary_key);

	neigh->nud_state = NUD_NOARP;

	neigh->ops = arp_direct_ops;

	neigh->output = neigh->ops->queue_xmit;

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ extern int ip_route_input(struct sk_buff*, __be32 dst, __be32 src, u8 tos, stru 
extern unsigned short	ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mtu);

extern void		ip_rt_send_redirect(struct sk_buff *skb);



extern unsigned		inet_addr_type(u32 addr);

extern unsigned		inet_addr_type(__be32 addr);

extern void		ip_rt_multicast_event(struct in_device *);

extern int		ip_rt_ioctl(unsigned int cmd, void __user *arg);

extern void		ip_rt_get_source(u8 *src, struct rtable *rt);

net/ipv4/arp.c

+2 −2
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static u32 arp_hash(const void *pkey, const struct net_device *dev) 


static int arp_constructor(struct neighbour *neigh)

{

	u32 addr = *(u32*)neigh->primary_key;

	__be32 addr = *(__be32*)neigh->primary_key;

	struct net_device *dev = neigh->dev;

	struct in_device *in_dev;

	struct neigh_parms *parms;
@@ -470,7 +470,7 @@ static int arp_set_predefined(int addr_hint, unsigned char * haddr, u32 paddr, s 
int arp_find(unsigned char *haddr, struct sk_buff *skb)

{

	struct net_device *dev = skb->dev;

	u32 paddr;

	__be32 paddr;

	struct neighbour *n;



	if (!skb->dst) {

net/ipv4/fib_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ struct net_device * ip_dev_find(__be32 addr) 
	return dev;

}



unsigned inet_addr_type(u32 addr)

unsigned inet_addr_type(__be32 addr)

{

	struct flowi		fl = { .nl_u = { .ip4_u = { .daddr = addr } } };

	struct fib_result	res;

net/ipv4/ip_options.c

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int ip_options_echo(struct ip_options * dopt, struct sk_buff * skb) 
					dopt->ts_needtime = 0;



					if (soffset + 8 <= optlen) {

						__u32 addr;

						__be32 addr;



						memcpy(&addr, sptr+soffset-1, 4);

						if (inet_addr_type(addr) != RTN_LOCAL) {
@@ -396,7 +396,7 @@ int ip_options_compile(struct ip_options * opt, struct sk_buff * skb) 
					}

					opt->ts = optptr - iph;

					{

						u32 addr;

						__be32 addr;

						memcpy(&addr, &optptr[optptr[2]-1], 4);

						if (inet_addr_type(addr) == RTN_UNICAST)

							break;