summaryrefslogtreecommitdiff
path: root/net/ipv4/tcp_timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r--net/ipv4/tcp_timer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 3901d11cac15..d9a4e91003ca 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -213,7 +213,7 @@ static void tcp_delack_timer(unsigned long data)
struct tcp_opt *tp = tcp_sk(sk);
bh_lock_sock(sk);
- if (sk->lock.users) {
+ if (sock_owned_by_user(sk)) {
/* Try again later. */
tp->ack.blocked = 1;
NET_INC_STATS_BH(DelayedACKLocked);
@@ -421,7 +421,7 @@ static void tcp_write_timer(unsigned long data)
int event;
bh_lock_sock(sk);
- if (sk->lock.users) {
+ if (sock_owned_by_user(sk)) {
/* Try again later */
if (!mod_timer(&tp->retransmit_timer, jiffies + (HZ/20)))
sock_hold(sk);
@@ -581,7 +581,7 @@ static void tcp_keepalive_timer (unsigned long data)
/* Only process if socket is not in use. */
bh_lock_sock(sk);
- if (sk->lock.users) {
+ if (sock_owned_by_user(sk)) {
/* Try again later. */
tcp_reset_keepalive_timer (sk, HZ/20);
goto out;