diff --git a/[refs] b/[refs] index 9702622640cf..a54020f949d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f5e6b9e69bf043074a0edabe3d271899c34eb79 +refs/heads/master: 265a92856b17524c87da0258ac0d3cec80ae1d35 diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index 30758035d616..f63d0d56712c 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -478,9 +478,9 @@ static inline void sk_add_backlog(struct sock *sk, struct sk_buff *skb) rc = __condition; \ if (!rc) { \ *(__timeo) = schedule_timeout(*(__timeo)); \ - rc = __condition; \ } \ lock_sock(__sk); \ + rc = __condition; \ rc; \ })