aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/tcp_ipv6.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r--net/ipv6/tcp_ipv6.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 720676d073d9..146f123b52c9 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -403,13 +403,13 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
403 403
404 /* Might be for an request_sock */ 404 /* Might be for an request_sock */
405 switch (sk->sk_state) { 405 switch (sk->sk_state) {
406 struct request_sock *req, **prev; 406 struct request_sock *req;
407 case TCP_LISTEN: 407 case TCP_LISTEN:
408 if (sock_owned_by_user(sk)) 408 if (sock_owned_by_user(sk))
409 goto out; 409 goto out;
410 410
411 /* Note : We use inet6_iif() here, not tcp_v6_iif() */ 411 /* Note : We use inet6_iif() here, not tcp_v6_iif() */
412 req = inet6_csk_search_req(sk, &prev, th->dest, &hdr->daddr, 412 req = inet6_csk_search_req(sk, th->dest, &hdr->daddr,
413 &hdr->saddr, inet6_iif(skb)); 413 &hdr->saddr, inet6_iif(skb));
414 if (!req) 414 if (!req)
415 goto out; 415 goto out;
@@ -424,7 +424,7 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
424 goto out; 424 goto out;
425 } 425 }
426 426
427 inet_csk_reqsk_queue_drop(sk, req, prev); 427 inet_csk_reqsk_queue_drop(sk, req);
428 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS); 428 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
429 goto out; 429 goto out;
430 430
@@ -980,16 +980,16 @@ static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
980 980
981static struct sock *tcp_v6_hnd_req(struct sock *sk, struct sk_buff *skb) 981static struct sock *tcp_v6_hnd_req(struct sock *sk, struct sk_buff *skb)
982{ 982{
983 struct request_sock *req, **prev;
984 const struct tcphdr *th = tcp_hdr(skb); 983 const struct tcphdr *th = tcp_hdr(skb);
984 struct request_sock *req;
985 struct sock *nsk; 985 struct sock *nsk;
986 986
987 /* Find possible connection requests. */ 987 /* Find possible connection requests. */
988 req = inet6_csk_search_req(sk, &prev, th->source, 988 req = inet6_csk_search_req(sk, th->source,
989 &ipv6_hdr(skb)->saddr, 989 &ipv6_hdr(skb)->saddr,
990 &ipv6_hdr(skb)->daddr, tcp_v6_iif(skb)); 990 &ipv6_hdr(skb)->daddr, tcp_v6_iif(skb));
991 if (req) 991 if (req)
992 return tcp_check_req(sk, skb, req, prev, false); 992 return tcp_check_req(sk, skb, req, false);
993 993
994 nsk = __inet6_lookup_established(sock_net(sk), &tcp_hashinfo, 994 nsk = __inet6_lookup_established(sock_net(sk), &tcp_hashinfo,
995 &ipv6_hdr(skb)->saddr, th->source, 995 &ipv6_hdr(skb)->saddr, th->source,