---

yaml --- r: 233599 b: refs/heads/master c: 91035f0 h: refs/heads/master i: 233597: 603e31e 233595: 40e7bb2 233591: ca1da35 233583: 7a68100 233567: 498797e 233535: 678e63f 233471: 084caba v: v3
git-mirror · Feb 20, 2011 · f946e4c · f946e4c
1 parent f21d854
commit f946e4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 		}