From 886cb4d8f8641af22ae18135c8ef4ee398e1b627 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 27 Sep 2006 18:27:13 -0700 Subject: [PATCH] --- yaml --- r: 36830 b: refs/heads/master c: adaf345b537681c6ed3657941904d976fe72f342 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/inet_sock.h | 4 ++-- trunk/net/ipv4/tcp_ipv4.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d693df691318..bde74b40057b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85670cc1faa2e1472e4a423cbf0b5e3d55c5ba88 +refs/heads/master: adaf345b537681c6ed3657941904d976fe72f342 diff --git a/trunk/include/net/inet_sock.h b/trunk/include/net/inet_sock.h index fc0b9e157b61..8130a375b867 100644 --- a/trunk/include/net/inet_sock.h +++ b/trunk/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/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c index 9018aa41cb55..89f3cf94685a 100644 --- a/trunk/net/ipv4/tcp_ipv4.c +++ b/trunk/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