aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-09-27 00:27:54 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 20:54:08 -0400
commita61ced5d1c2e773620d7855ea2009d770c10a6e6 (patch)
treeca9d49774eb4740a60e5338d4da51af1c8c862d6
parent011a92610826bdeec4b80ab423958d4c512639f6 (diff)
[IPV4]: inet_select_addr() annotations
argument and return value are net-endian. Annotated function and inferred net-endian variables in callers. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/inetdevice.h2
-rw-r--r--net/ipv4/arp.c4
-rw-r--r--net/ipv4/devinet.c4
-rw-r--r--net/ipv4/icmp.c2
-rw-r--r--net/ipv4/ipvs/ip_vs_sync.c2
-rw-r--r--net/ipv4/netfilter/ipt_MASQUERADE.c2
-rw-r--r--net/ipv4/route.c4
7 files changed, 10 insertions, 10 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 92297ff24e85..40d07d0b896b 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -110,7 +110,7 @@ extern int devinet_ioctl(unsigned int cmd, void __user *);
110extern void devinet_init(void); 110extern void devinet_init(void);
111extern struct in_device *inetdev_init(struct net_device *dev); 111extern struct in_device *inetdev_init(struct net_device *dev);
112extern struct in_device *inetdev_by_index(int); 112extern struct in_device *inetdev_by_index(int);
113extern u32 inet_select_addr(const struct net_device *dev, u32 dst, int scope); 113extern __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope);
114extern u32 inet_confirm_addr(const struct net_device *dev, u32 dst, u32 local, int scope); 114extern u32 inet_confirm_addr(const struct net_device *dev, u32 dst, u32 local, int scope);
115extern struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, u32 prefix, u32 mask); 115extern struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, u32 prefix, u32 mask);
116extern void inet_forward_change(void); 116extern void inet_forward_change(void);
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 48e1ccb2ff55..db72339c21e1 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -330,10 +330,10 @@ static void arp_error_report(struct neighbour *neigh, struct sk_buff *skb)
330 330
331static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb) 331static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
332{ 332{
333 u32 saddr = 0; 333 __be32 saddr = 0;
334 u8 *dst_ha = NULL; 334 u8 *dst_ha = NULL;
335 struct net_device *dev = neigh->dev; 335 struct net_device *dev = neigh->dev;
336 u32 target = *(u32*)neigh->primary_key; 336 __be32 target = *(__be32*)neigh->primary_key;
337 int probes = atomic_read(&neigh->probes); 337 int probes = atomic_read(&neigh->probes);
338 struct in_device *in_dev = in_dev_get(dev); 338 struct in_device *in_dev = in_dev_get(dev);
339 339
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 8e8d1f17d77a..bffbbecef455 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -876,9 +876,9 @@ out:
876 return done; 876 return done;
877} 877}
878 878
879u32 inet_select_addr(const struct net_device *dev, u32 dst, int scope) 879__be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope)
880{ 880{
881 u32 addr = 0; 881 __be32 addr = 0;
882 struct in_device *in_dev; 882 struct in_device *in_dev;
883 883
884 rcu_read_lock(); 884 rcu_read_lock();
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index c2ad07e48ab4..fd39685241c1 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -437,7 +437,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, u32 info)
437 struct icmp_bxm icmp_param; 437 struct icmp_bxm icmp_param;
438 struct rtable *rt = (struct rtable *)skb_in->dst; 438 struct rtable *rt = (struct rtable *)skb_in->dst;
439 struct ipcm_cookie ipc; 439 struct ipcm_cookie ipc;
440 u32 saddr; 440 __be32 saddr;
441 u8 tos; 441 u8 tos;
442 442
443 if (!rt) 443 if (!rt)
diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c
index 1bca714bda3d..0c8d20da6139 100644
--- a/net/ipv4/ipvs/ip_vs_sync.c
+++ b/net/ipv4/ipvs/ip_vs_sync.c
@@ -464,7 +464,7 @@ join_mcast_group(struct sock *sk, struct in_addr *addr, char *ifname)
464static int bind_mcastif_addr(struct socket *sock, char *ifname) 464static int bind_mcastif_addr(struct socket *sock, char *ifname)
465{ 465{
466 struct net_device *dev; 466 struct net_device *dev;
467 u32 addr; 467 __be32 addr;
468 struct sockaddr_in sin; 468 struct sockaddr_in sin;
469 469
470 if ((dev = __dev_get_by_name(ifname)) == NULL) 470 if ((dev = __dev_get_by_name(ifname)) == NULL)
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index bc65168a3437..3dbfcfac8a84 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -70,7 +70,7 @@ masquerade_target(struct sk_buff **pskb,
70 const struct ip_nat_multi_range_compat *mr; 70 const struct ip_nat_multi_range_compat *mr;
71 struct ip_nat_range newrange; 71 struct ip_nat_range newrange;
72 struct rtable *rt; 72 struct rtable *rt;
73 u_int32_t newsrc; 73 __be32 newsrc;
74 74
75 IP_NF_ASSERT(hooknum == NF_IP_POST_ROUTING); 75 IP_NF_ASSERT(hooknum == NF_IP_POST_ROUTING);
76 76
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 32fcb77295f0..9d8fbf1e5bc3 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1532,7 +1532,7 @@ static int ip_rt_bug(struct sk_buff *skb)
1532 1532
1533void ip_rt_get_source(u8 *addr, struct rtable *rt) 1533void ip_rt_get_source(u8 *addr, struct rtable *rt)
1534{ 1534{
1535 u32 src; 1535 __be32 src;
1536 struct fib_result res; 1536 struct fib_result res;
1537 1537
1538 if (rt->fl.iif == 0) 1538 if (rt->fl.iif == 0)
@@ -1603,7 +1603,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
1603{ 1603{
1604 unsigned hash; 1604 unsigned hash;
1605 struct rtable *rth; 1605 struct rtable *rth;
1606 u32 spec_dst; 1606 __be32 spec_dst;
1607 struct in_device *in_dev = in_dev_get(dev); 1607 struct in_device *in_dev = in_dev_get(dev);
1608 u32 itag = 0; 1608 u32 itag = 0;
1609 1609