aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_ipv4.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r--net/ipv4/tcp_ipv4.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 39b179856082..c83938b8fcb1 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -159,7 +159,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
159 struct tcp_sock *tp = tcp_sk(sk); 159 struct tcp_sock *tp = tcp_sk(sk);
160 struct sockaddr_in *usin = (struct sockaddr_in *)uaddr; 160 struct sockaddr_in *usin = (struct sockaddr_in *)uaddr;
161 struct rtable *rt; 161 struct rtable *rt;
162 u32 daddr, nexthop; 162 __be32 daddr, nexthop;
163 int tmp; 163 int tmp;
164 int err; 164 int err;
165 165
@@ -734,8 +734,8 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
734 struct inet_request_sock *ireq; 734 struct inet_request_sock *ireq;
735 struct tcp_options_received tmp_opt; 735 struct tcp_options_received tmp_opt;
736 struct request_sock *req; 736 struct request_sock *req;
737 __u32 saddr = skb->nh.iph->saddr; 737 __be32 saddr = skb->nh.iph->saddr;
738 __u32 daddr = skb->nh.iph->daddr; 738 __be32 daddr = skb->nh.iph->daddr;
739 __u32 isn = TCP_SKB_CB(skb)->when; 739 __u32 isn = TCP_SKB_CB(skb)->when;
740 struct dst_entry *dst = NULL; 740 struct dst_entry *dst = NULL;
741#ifdef CONFIG_SYN_COOKIES 741#ifdef CONFIG_SYN_COOKIES
@@ -1763,7 +1763,7 @@ static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i)
1763 1763
1764static void get_timewait4_sock(struct inet_timewait_sock *tw, char *tmpbuf, int i) 1764static void get_timewait4_sock(struct inet_timewait_sock *tw, char *tmpbuf, int i)
1765{ 1765{
1766 unsigned int dest, src; 1766 __be32 dest, src;
1767 __u16 destp, srcp; 1767 __u16 destp, srcp;
1768 int ttd = tw->tw_ttd - jiffies; 1768 int ttd = tw->tw_ttd - jiffies;
1769 1769