inet: drop prev pointer handling in request sock

When request sock are put in ehash table, the whole notion
of having a previous request to update dl_next is pointless.

Also, following patch will get rid of big purge timer,
so we want to delete a request sock without holding listener lock.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 11 deletions

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index c655de5f67c9..ae2184039fe3 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -149,12 +149,12 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
         /* Might be for an request_sock */
         switch (sk->sk_state) {
-                struct request_sock *req, **prev;
+                struct request_sock *req;
         case DCCP_LISTEN:
                 if (sock_owned_by_user(sk))
                         goto out;
 
-                req = inet6_csk_search_req(sk, &prev, dh->dccph_dport,
+                req = inet6_csk_search_req(sk, dh->dccph_dport,
                                            &hdr->daddr, &hdr->saddr,
                                            inet6_iif(skb));
                 if (req == NULL)
@@ -172,7 +172,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                         goto out;
                 }
 
-                inet_csk_reqsk_queue_drop(sk, req, prev);
+                inet_csk_reqsk_queue_drop(sk, req);
                 goto out;
 
         case DCCP_REQUESTING:
@@ -317,16 +317,13 @@ static struct sock *dccp_v6_hnd_req(struct sock *sk,struct sk_buff *skb)
 {
         const struct dccp_hdr *dh = dccp_hdr(skb);
         const struct ipv6hdr *iph = ipv6_hdr(skb);
+        struct request_sock *req;
         struct sock *nsk;
-        struct request_sock **prev;
-        /* Find possible connection requests. */
-        struct request_sock *req = inet6_csk_search_req(sk, &prev,
-                                                        dh->dccph_sport,
-                                                        &iph->saddr,
-                                                        &iph->daddr,
-                                                        inet6_iif(skb));
+
+        req = inet6_csk_search_req(sk, dh->dccph_sport, &iph->saddr,
+                                   &iph->daddr, inet6_iif(skb));
         if (req != NULL)
-                return dccp_check_req(sk, skb, req, prev);
+                return dccp_check_req(sk, skb, req);
 
         nsk = __inet6_lookup_established(sock_net(sk), &dccp_hashinfo,
                                          &iph->saddr, dh->dccph_sport,