Commit bada8adc authored by Al Viro's avatar Al Viro Committed by David S. Miller

[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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f2c3fe24
...@@ -144,8 +144,8 @@ static inline char rt_tos2priority(u8 tos) ...@@ -144,8 +144,8 @@ static inline char rt_tos2priority(u8 tos)
return ip_tos2prio[IPTOS_TOS(tos)>>1]; return ip_tos2prio[IPTOS_TOS(tos)>>1];
} }
static inline int ip_route_connect(struct rtable **rp, u32 dst, static inline int ip_route_connect(struct rtable **rp, __be32 dst,
u32 src, u32 tos, int oif, u8 protocol, __be32 src, u32 tos, int oif, u8 protocol,
u16 sport, u16 dport, struct sock *sk) u16 sport, u16 dport, struct sock *sk)
{ {
struct flowi fl = { .oif = oif, struct flowi fl = { .oif = oif,
......
...@@ -50,7 +50,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -50,7 +50,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
struct dccp_sock *dp = dccp_sk(sk); struct dccp_sock *dp = dccp_sk(sk);
const struct sockaddr_in *usin = (struct sockaddr_in *)uaddr; const struct sockaddr_in *usin = (struct sockaddr_in *)uaddr;
struct rtable *rt; struct rtable *rt;
u32 daddr, nexthop; __be32 daddr, nexthop;
int tmp; int tmp;
int err; int err;
......
...@@ -996,7 +996,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) ...@@ -996,7 +996,7 @@ static int inet_sk_reselect_saddr(struct sock *sk)
struct rtable *rt; struct rtable *rt;
__u32 old_saddr = inet->saddr; __u32 old_saddr = inet->saddr;
__u32 new_saddr; __u32 new_saddr;
__u32 daddr = inet->daddr; __be32 daddr = inet->daddr;
if (inet->opt && inet->opt->srr) if (inet->opt && inet->opt->srr)
daddr = inet->opt->faddr; daddr = inet->opt->faddr;
......
...@@ -25,7 +25,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -25,7 +25,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
struct inet_sock *inet = inet_sk(sk); struct inet_sock *inet = inet_sk(sk);
struct sockaddr_in *usin = (struct sockaddr_in *) uaddr; struct sockaddr_in *usin = (struct sockaddr_in *) uaddr;
struct rtable *rt; struct rtable *rt;
u32 saddr; __be32 saddr;
int oif; int oif;
int err; int err;
......
...@@ -159,7 +159,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -159,7 +159,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
struct sockaddr_in *usin = (struct sockaddr_in *)uaddr; struct sockaddr_in *usin = (struct sockaddr_in *)uaddr;
struct rtable *rt; struct rtable *rt;
u32 daddr, nexthop; __be32 daddr, nexthop;
int tmp; int tmp;
int err; int err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment