diff options
Diffstat (limited to 'net/ipv6/inet6_connection_sock.c')
-rw-r--r-- | net/ipv6/inet6_connection_sock.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index 29b32206e494..b7acb9ebc4f5 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c | |||
@@ -113,7 +113,6 @@ static u32 inet6_synq_hash(const struct in6_addr *raddr, const __be16 rport, | |||
113 | } | 113 | } |
114 | 114 | ||
115 | struct request_sock *inet6_csk_search_req(const struct sock *sk, | 115 | struct request_sock *inet6_csk_search_req(const struct sock *sk, |
116 | struct request_sock ***prevp, | ||
117 | const __be16 rport, | 116 | const __be16 rport, |
118 | const struct in6_addr *raddr, | 117 | const struct in6_addr *raddr, |
119 | const struct in6_addr *laddr, | 118 | const struct in6_addr *laddr, |
@@ -121,13 +120,13 @@ struct request_sock *inet6_csk_search_req(const struct sock *sk, | |||
121 | { | 120 | { |
122 | const struct inet_connection_sock *icsk = inet_csk(sk); | 121 | const struct inet_connection_sock *icsk = inet_csk(sk); |
123 | struct listen_sock *lopt = icsk->icsk_accept_queue.listen_opt; | 122 | struct listen_sock *lopt = icsk->icsk_accept_queue.listen_opt; |
124 | struct request_sock *req, **prev; | 123 | struct request_sock *req; |
125 | 124 | ||
126 | for (prev = &lopt->syn_table[inet6_synq_hash(raddr, rport, | 125 | for (req = lopt->syn_table[inet6_synq_hash(raddr, rport, |
127 | lopt->hash_rnd, | 126 | lopt->hash_rnd, |
128 | lopt->nr_table_entries)]; | 127 | lopt->nr_table_entries)]; |
129 | (req = *prev) != NULL; | 128 | req != NULL; |
130 | prev = &req->dl_next) { | 129 | req = req->dl_next) { |
131 | const struct inet_request_sock *ireq = inet_rsk(req); | 130 | const struct inet_request_sock *ireq = inet_rsk(req); |
132 | 131 | ||
133 | if (ireq->ir_rmt_port == rport && | 132 | if (ireq->ir_rmt_port == rport && |
@@ -136,7 +135,6 @@ struct request_sock *inet6_csk_search_req(const struct sock *sk, | |||
136 | ipv6_addr_equal(&ireq->ir_v6_loc_addr, laddr) && | 135 | ipv6_addr_equal(&ireq->ir_v6_loc_addr, laddr) && |
137 | (!ireq->ir_iif || ireq->ir_iif == iif)) { | 136 | (!ireq->ir_iif || ireq->ir_iif == iif)) { |
138 | WARN_ON(req->sk != NULL); | 137 | WARN_ON(req->sk != NULL); |
139 | *prevp = prev; | ||
140 | return req; | 138 | return req; |
141 | } | 139 | } |
142 | } | 140 | } |