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

[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

include/net/route.h

+2 −2
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ static inline char rt_tos2priority(u8 tos) 
	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,

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	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;

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) 
	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;

net/ipv4/datagram.c

+1 −1
Original line number Diff line number Diff line
@@ -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 sockaddr_in *usin = (struct sockaddr_in *) uaddr;

	struct rtable *rt;

	u32 saddr;

	__be32 saddr;

	int oif;

	int err;

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -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 sockaddr_in *usin = (struct sockaddr_in *)uaddr;

	struct rtable *rt;

	u32 daddr, nexthop;

	__be32 daddr, nexthop;

	int tmp;

	int err;