[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>
diff --git a/include/net/route.h b/include/net/route.h index 5bb2b15..6352484 100644 --- a/include/net/route.h +++ b/include/net/route.h
@@ -144,8 +144,8 @@ return ip_tos2prio[IPTOS_TOS(tos)>>1]; } -static inline int ip_route_connect(struct rtable **rp, u32 dst, - u32 src, u32 tos, int oif, u8 protocol, +static inline int ip_route_connect(struct rtable **rp, __be32 dst, + __be32 src, u32 tos, int oif, u8 protocol, u16 sport, u16 dport, struct sock *sk) { struct flowi fl = { .oif = oif,
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 66be29b..bf692c1 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c
@@ -50,7 +50,7 @@ struct dccp_sock *dp = dccp_sk(sk); const struct sockaddr_in *usin = (struct sockaddr_in *)uaddr; struct rtable *rt; - u32 daddr, nexthop; + __be32 daddr, nexthop; int tmp; int err;
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index fdd89e3..250a02b 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c
@@ -996,7 +996,7 @@ struct rtable *rt; __u32 old_saddr = inet->saddr; __u32 new_saddr; - __u32 daddr = inet->daddr; + __be32 daddr = inet->daddr; if (inet->opt && inet->opt->srr) daddr = inet->opt->faddr;
diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index ec5da4f..7b068a8 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c
@@ -25,7 +25,7 @@ struct inet_sock *inet = inet_sk(sk); struct sockaddr_in *usin = (struct sockaddr_in *) uaddr; struct rtable *rt; - u32 saddr; + __be32 saddr; int oif; int err;
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 39b1798..9018aa4 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c
@@ -159,7 +159,7 @@ struct tcp_sock *tp = tcp_sk(sk); struct sockaddr_in *usin = (struct sockaddr_in *)uaddr; struct rtable *rt; - u32 daddr, nexthop; + __be32 daddr, nexthop; int tmp; int err;