diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-27 00:27:15 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 20:54:06 -0400 |
commit | bada8adc4e6622764205921e6ba3f717aa03c882 (patch) | |
tree | 6052ffa8b3f6fbb8e11566f7a0e3f1f557acccd2 | |
parent | f2c3fe24119ee4f8faca08699f0488f500014a27 (diff) |
[IPV4]: ip_route_connect() ipv4 address arguments annotated
annotated address arguments (port number left alone for now); ditto
for 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/net/route.h | 4 | ||||
-rw-r--r-- | net/dccp/ipv4.c | 2 | ||||
-rw-r--r-- | net/ipv4/af_inet.c | 2 | ||||
-rw-r--r-- | net/ipv4/datagram.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/include/net/route.h b/include/net/route.h index 5bb2b15b4391..63524843f6d9 100644 --- a/include/net/route.h +++ b/include/net/route.h | |||
@@ -144,8 +144,8 @@ static inline char rt_tos2priority(u8 tos) | |||
144 | return ip_tos2prio[IPTOS_TOS(tos)>>1]; | 144 | return ip_tos2prio[IPTOS_TOS(tos)>>1]; |
145 | } | 145 | } |
146 | 146 | ||
147 | static inline int ip_route_connect(struct rtable **rp, u32 dst, | 147 | static inline int ip_route_connect(struct rtable **rp, __be32 dst, |
148 | u32 src, u32 tos, int oif, u8 protocol, | 148 | __be32 src, u32 tos, int oif, u8 protocol, |
149 | u16 sport, u16 dport, struct sock *sk) | 149 | u16 sport, u16 dport, struct sock *sk) |
150 | { | 150 | { |
151 | struct flowi fl = { .oif = oif, | 151 | struct flowi fl = { .oif = oif, |
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 66be29b6f508..bf692c1c116f 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -50,7 +50,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) | |||
50 | struct dccp_sock *dp = dccp_sk(sk); | 50 | struct dccp_sock *dp = dccp_sk(sk); |
51 | const struct sockaddr_in *usin = (struct sockaddr_in *)uaddr; | 51 | const struct sockaddr_in *usin = (struct sockaddr_in *)uaddr; |
52 | struct rtable *rt; | 52 | struct rtable *rt; |
53 | u32 daddr, nexthop; | 53 | __be32 daddr, nexthop; |
54 | int tmp; | 54 | int tmp; |
55 | int err; | 55 | int err; |
56 | 56 | ||
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index fdd89e37b9aa..250a02b23e4e 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -996,7 +996,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) | |||
996 | struct rtable *rt; | 996 | struct rtable *rt; |
997 | __u32 old_saddr = inet->saddr; | 997 | __u32 old_saddr = inet->saddr; |
998 | __u32 new_saddr; | 998 | __u32 new_saddr; |
999 | __u32 daddr = inet->daddr; | 999 | __be32 daddr = inet->daddr; |
1000 | 1000 | ||
1001 | if (inet->opt && inet->opt->srr) | 1001 | if (inet->opt && inet->opt->srr) |
1002 | daddr = inet->opt->faddr; | 1002 | daddr = inet->opt->faddr; |
diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index ec5da4fbd9f4..7b068a891953 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c | |||
@@ -25,7 +25,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) | |||
25 | struct inet_sock *inet = inet_sk(sk); | 25 | struct inet_sock *inet = inet_sk(sk); |
26 | struct sockaddr_in *usin = (struct sockaddr_in *) uaddr; | 26 | struct sockaddr_in *usin = (struct sockaddr_in *) uaddr; |
27 | struct rtable *rt; | 27 | struct rtable *rt; |
28 | u32 saddr; | 28 | __be32 saddr; |
29 | int oif; | 29 | int oif; |
30 | int err; | 30 | int err; |
31 | 31 | ||
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 39b179856082..9018aa41cb55 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -159,7 +159,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) | |||
159 | struct tcp_sock *tp = tcp_sk(sk); | 159 | struct tcp_sock *tp = tcp_sk(sk); |
160 | struct sockaddr_in *usin = (struct sockaddr_in *)uaddr; | 160 | struct sockaddr_in *usin = (struct sockaddr_in *)uaddr; |
161 | struct rtable *rt; | 161 | struct rtable *rt; |
162 | u32 daddr, nexthop; | 162 | __be32 daddr, nexthop; |
163 | int tmp; | 163 | int tmp; |
164 | int err; | 164 | int err; |
165 | 165 | ||