diff --git a/[refs] b/[refs] index 9c39be733db9..fdc5d5690794 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ece639caa33c85c8805fa4a0a5955b8de9c95346 +refs/heads/master: 91035f0b7d89291af728b6f3e370c3be58fcbe1b diff --git a/trunk/net/ipv4/inet_timewait_sock.c b/trunk/net/ipv4/inet_timewait_sock.c index c5af909cf701..3c8dfa16614d 100644 --- a/trunk/net/ipv4/inet_timewait_sock.c +++ b/trunk/net/ipv4/inet_timewait_sock.c @@ -505,7 +505,9 @@ void inet_twsk_purge(struct inet_hashinfo *hashinfo, } rcu_read_unlock(); + local_bh_disable(); inet_twsk_deschedule(tw, twdr); + local_bh_enable(); inet_twsk_put(tw); goto restart_rcu; }