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

[IPV4]: struct ip_options annotations 



->faddr is net-endian; annotated as such, variables inferred to be net-endian
annotated.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f25afbb

include/net/inet_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
 * @ts_needaddr - Need to record addr of outgoing dev

 */

struct ip_options {

	__u32		faddr;

	__be32		faddr;

	unsigned char	optlen;

	unsigned char	srr;

	unsigned char	rr;

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ int inet_sk_rebuild_header(struct sock *sk) 
{

	struct inet_sock *inet = inet_sk(sk);

	struct rtable *rt = (struct rtable *)__sk_dst_check(sk, 0);

	u32 daddr;

	__be32 daddr;

	int err;



	/* Route is OK, nothing to do. */

net/ipv4/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) 
	struct inet_sock *inet = inet_sk(sk);

	struct ipcm_cookie ipc;

	struct rtable *rt = (struct rtable *)skb->dst;

	u32 daddr;

	__be32 daddr;



	if (ip_options_echo(&icmp_param->replyopts, skb))

		return;

net/ipv4/ip_options.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ int ip_options_echo(struct ip_options * dopt, struct sk_buff * skb) 
	}

	if (sopt->srr) {

		unsigned char * start = sptr+sopt->srr;

		u32 faddr;

		__be32 faddr;



		optlen  = start[1];

		soffset = start[2];

net/ipv4/ip_output.c

+2 −2
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ int ip_queue_xmit(struct sk_buff *skb, int ipfragok) 
	/* Make sure we can route this packet. */

	rt = (struct rtable *)__sk_dst_check(sk, 0);

	if (rt == NULL) {

		u32 daddr;

		__be32 daddr;



		/* Use correct destination address if we have options. */

		daddr = inet->daddr;
@@ -1340,7 +1340,7 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar 
		char			data[40];

	} replyopts;

	struct ipcm_cookie ipc;

	u32 daddr;

	__be32 daddr;

	struct rtable *rt = (struct rtable*)skb->dst;



	if (ip_options_echo(&replyopts.opt, skb))