OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[uclinux-h8/linux.git]
/
net
/
ipv4
/
inet_connection_sock.c
diff --git
a/net/ipv4/inet_connection_sock.c
b/net/ipv4/inet_connection_sock.c
index
60021d0
..
1349571
100644
(file)
--- a/
net/ipv4/inet_connection_sock.c
+++ b/
net/ipv4/inet_connection_sock.c
@@
-593,7
+593,7
@@
static bool reqsk_queue_unlink(struct request_sock_queue *queue,
}
spin_unlock(&queue->syn_wait_lock);
- if (
del_timer
(&req->rsk_timer))
+ if (
timer_pending(&req->rsk_timer) && del_timer_sync
(&req->rsk_timer))
reqsk_put(req);
return found;
}