[IPV4]: annotate address in inet_request_sock

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index fc0b9e157b615288ed48ffed2525bd710ca92cc9..8130a375b8675a463a1a31bbfed25c7bd22725dc 100644 (file)
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -62,8 +62,8 @@ struct inet_request_sock {
        u16                     inet6_rsk_offset;
        /* 2 bytes hole, try to pack */
 #endif
-       u32                     loc_addr;
-       u32                     rmt_addr;
+       __be32                  loc_addr;
+       __be32                  rmt_addr;
        u16                     rmt_port;
        u16                     snd_wscale : 4, 
                                rcv_wscale : 4, 

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 9018aa41cb55b9b32d3f50f491b051738e7cf9e9..89f3cf94685ae53735c1621bfd55b40b7deca4ac 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -734,8 +734,8 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
        struct inet_request_sock *ireq;
        struct tcp_options_received tmp_opt;
        struct request_sock *req;
-       __u32 saddr = skb->nh.iph->saddr;
-       __u32 daddr = skb->nh.iph->daddr;
+       __be32 saddr = skb->nh.iph->saddr;
+       __be32 daddr = skb->nh.iph->daddr;
        __u32 isn = TCP_SKB_CB(skb)->when;
        struct dst_entry *dst = NULL;
 #ifdef CONFIG_SYN_COOKIES