Hi David, Please consider pulling from:
master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.16.git Best Regards, - Arnaldo
tree e941c1c8b26eebb49f94cafc292e2e28fea4d008 parent e82e7da9b2bb8ee35d6c8b3e7484a1e0c5421c46 author Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> 1133395069 -0200 committer Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> 1133395069 -0200 [ICSK]: make inet_csk_reqsk_queue_hash_add timeout arg unsigned long Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> ------------------------------------------------------------------------------ include/net/inet_connection_sock.h | 2 +- net/ipv4/inet_connection_sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ------------------------------------------------------------------------------ diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index edc68e8..ccc81a1 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h @@ -211,7 +211,7 @@ static inline void inet_csk_reqsk_queue_ extern void inet_csk_reqsk_queue_hash_add(struct sock *sk, struct request_sock *req, - const unsigned timeout); + unsigned long timeout); static inline void inet_csk_reqsk_queue_removed(struct sock *sk, struct request_sock *req) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index f05b6e7..e2bf508 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -385,7 +385,7 @@ struct request_sock *inet_csk_search_req EXPORT_SYMBOL_GPL(inet_csk_search_req); void inet_csk_reqsk_queue_hash_add(struct sock *sk, struct request_sock *req, - const unsigned timeout) + unsigned long timeout) { struct inet_connection_sock *icsk = inet_csk(sk); struct listen_sock *lopt = icsk->icsk_accept_queue.listen_opt;