tcp/dccp: remove inet_csk_reqsk_queue_added() timeout argument

edumazet · davem330 · commit 2feda34192a3 · 2015-10-03T04:32:40.000-07:00
This is no longer used.

Signed-off-by: Eric Dumazet &lt;edumazet@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
@@ -282,8 +282,7 @@ static inline void inet_csk_reqsk_queue_add(struct sock *sk,
 void inet_csk_reqsk_queue_hash_add(struct sock *sk, struct request_sock *req,
 				   unsigned long timeout);
 
-static inline void inet_csk_reqsk_queue_added(struct sock *sk,
-					      const unsigned long timeout)
+static inline void inet_csk_reqsk_queue_added(struct sock *sk)
 {
 	reqsk_queue_added(&inet_csk(sk)->icsk_accept_queue);
 }
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
@@ -531,7 +531,7 @@ void inet_csk_reqsk_queue_hash_add(struct sock *sk, struct request_sock *req,
 				     lopt->hash_rnd, lopt->nr_table_entries);
 
 	reqsk_queue_hash_req(&icsk->icsk_accept_queue, h, req, timeout);
-	inet_csk_reqsk_queue_added(sk, timeout);
+	inet_csk_reqsk_queue_added(sk);
 }
 EXPORT_SYMBOL_GPL(inet_csk_reqsk_queue_hash_add);
 
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
@@ -157,7 +157,7 @@ void inet6_csk_reqsk_queue_hash_add(struct sock *sk,
 				      lopt->hash_rnd, lopt->nr_table_entries);
 
 	reqsk_queue_hash_req(&icsk->icsk_accept_queue, h, req, timeout);
-	inet_csk_reqsk_queue_added(sk, timeout);
+	inet_csk_reqsk_queue_added(sk);
 }
 EXPORT_SYMBOL_GPL(inet6_csk_reqsk_queue_hash_add);
 

Original file line number	Diff line number	Diff line change
`@@ -282,8 +282,7 @@ static inline void inet_csk_reqsk_queue_add(struct sock *sk,`
`282`	`282`	`void inet_csk_reqsk_queue_hash_add(struct sock sk, struct request_sock req,`
`283`	`283`	`unsigned long timeout);`
`284`	`284`
`285`		`-static inline void inet_csk_reqsk_queue_added(struct sock *sk,`
`286`		`- const unsigned long timeout)`
	`285`	`+static inline void inet_csk_reqsk_queue_added(struct sock *sk)`
`287`	`286`	`{`
`288`	`287`	`reqsk_queue_added(&inet_csk(sk)->icsk_accept_queue);`
`289`	`288`	`}`
Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ void inet_csk_reqsk_queue_hash_add(struct sock sk, struct request_sock req,`
`531`	`531`	`lopt->hash_rnd, lopt->nr_table_entries);`
`532`	`532`
`533`	`533`	`reqsk_queue_hash_req(&icsk->icsk_accept_queue, h, req, timeout);`
`534`		`- inet_csk_reqsk_queue_added(sk, timeout);`
	`534`	`+ inet_csk_reqsk_queue_added(sk);`
`535`	`535`	`}`
`536`	`536`	`EXPORT_SYMBOL_GPL(inet_csk_reqsk_queue_hash_add);`
`537`	`537`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ void inet6_csk_reqsk_queue_hash_add(struct sock *sk,`
`157`	`157`	`lopt->hash_rnd, lopt->nr_table_entries);`
`158`	`158`
`159`	`159`	`reqsk_queue_hash_req(&icsk->icsk_accept_queue, h, req, timeout);`
`160`		`- inet_csk_reqsk_queue_added(sk, timeout);`
	`160`	`+ inet_csk_reqsk_queue_added(sk);`
`161`	`161`	`}`
`162`	`162`	`EXPORT_SYMBOL_GPL(inet6_csk_reqsk_queue_hash_add);`
`163`	`163`