From f946e4ca669fbef189aace46945f2ace13257c14 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 18 Feb 2011 22:35:56 +0000
Subject: [PATCH] --- yaml --- r: 233599 b: refs/heads/master c:
 91035f0b7d89291af728b6f3e370c3be58fcbe1b h: refs/heads/master i:   233597:
 603e31e8e36fa64a5d67a6db051e34de46633228   233595:
 40e7bb2050e9a408596a85578ea171ffb7204bfd   233591:
 ca1da35c88f6f5fb37f28053e1d547b3e0a1047f   233583:
 7a6810017340cb17600b29bbf1edb681ef2c9196   233567:
 498797e025fe002ece4a6385769f9619aa07334c   233535:
 678e63f57ca284d886eb4a2fc9e3bc7625f4e448   233471:
 084caba7e692ebffef08f75651b84a0942241987 v: v3

---
 [refs]                              | 2 +-
 trunk/net/ipv4/inet_timewait_sock.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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;
 		}