diff options
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 2f932ce72610..cb880079daf3 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -138,14 +138,14 @@ static int __tcp_v6_check_established(struct sock *sk, const __u16 lport, | |||
138 | 138 | ||
139 | /* Check TIME-WAIT sockets first. */ | 139 | /* Check TIME-WAIT sockets first. */ |
140 | sk_for_each(sk2, node, &(head + tcp_hashinfo.ehash_size)->chain) { | 140 | sk_for_each(sk2, node, &(head + tcp_hashinfo.ehash_size)->chain) { |
141 | const struct tcp6_timewait_sock *tcp6tw = tcp6_twsk(sk2); | 141 | const struct inet6_timewait_sock *tw6 = inet6_twsk(sk2); |
142 | 142 | ||
143 | tw = inet_twsk(sk2); | 143 | tw = inet_twsk(sk2); |
144 | 144 | ||
145 | if(*((__u32 *)&(tw->tw_dport)) == ports && | 145 | if(*((__u32 *)&(tw->tw_dport)) == ports && |
146 | sk2->sk_family == PF_INET6 && | 146 | sk2->sk_family == PF_INET6 && |
147 | ipv6_addr_equal(&tcp6tw->tw_v6_daddr, saddr) && | 147 | ipv6_addr_equal(&tw6->tw_v6_daddr, saddr) && |
148 | ipv6_addr_equal(&tcp6tw->tw_v6_rcv_saddr, daddr) && | 148 | ipv6_addr_equal(&tw6->tw_v6_rcv_saddr, daddr) && |
149 | sk2->sk_bound_dev_if == sk->sk_bound_dev_if) { | 149 | sk2->sk_bound_dev_if == sk->sk_bound_dev_if) { |
150 | const struct tcp_timewait_sock *tcptw = tcp_twsk(sk2); | 150 | const struct tcp_timewait_sock *tcptw = tcp_twsk(sk2); |
151 | struct tcp_sock *tp = tcp_sk(sk); | 151 | struct tcp_sock *tp = tcp_sk(sk); |
@@ -1663,14 +1663,14 @@ static void get_timewait6_sock(struct seq_file *seq, | |||
1663 | { | 1663 | { |
1664 | struct in6_addr *dest, *src; | 1664 | struct in6_addr *dest, *src; |
1665 | __u16 destp, srcp; | 1665 | __u16 destp, srcp; |
1666 | struct tcp6_timewait_sock *tcp6tw = tcp6_twsk((struct sock *)tw); | 1666 | struct inet6_timewait_sock *tw6 = inet6_twsk((struct sock *)tw); |
1667 | int ttd = tw->tw_ttd - jiffies; | 1667 | int ttd = tw->tw_ttd - jiffies; |
1668 | 1668 | ||
1669 | if (ttd < 0) | 1669 | if (ttd < 0) |
1670 | ttd = 0; | 1670 | ttd = 0; |
1671 | 1671 | ||
1672 | dest = &tcp6tw->tw_v6_daddr; | 1672 | dest = &tw6->tw_v6_daddr; |
1673 | src = &tcp6tw->tw_v6_rcv_saddr; | 1673 | src = &tw6->tw_v6_rcv_saddr; |
1674 | destp = ntohs(tw->tw_dport); | 1674 | destp = ntohs(tw->tw_dport); |
1675 | srcp = ntohs(tw->tw_sport); | 1675 | srcp = ntohs(tw->tw_sport); |
1676 | 1676 | ||