path: root/net/ipv4/inet_timewait_sock.c
diff options
authorLinus Torvalds <>2011-02-23 16:02:00 -0800
committerLinus Torvalds <>2011-02-23 16:02:00 -0800
commitef3242859fae47e728b50b7ce3d17b201a71779a (patch)
tree7857320b5209cafc231b329b9dab67ddb53f8128 /net/ipv4/inet_timewait_sock.c
parentb5f7376eb30538d03dd27f6a59b5b2d28587967c (diff)
parent518d020a18716024187ee0b834c8f5bfebd59398 (diff)
Merge git://
* git:// (33 commits) Added support for usb ethernet (0x0fe6, 0x9700) r8169: fix RTL8168DP power off issue. r8169: correct settings of rtl8102e. r8169: fix incorrect args to oob notify. DM9000B: Fix PHY power for network down/up DM9000B: Fix reg_save after spin_lock in dm9000_timeout net_sched: long word align struct qdisc_skb_cb data sfc: lower stack usage in efx_ethtool_self_test bridge: Use IPv6 link-local address for multicast listener queries bridge: Fix MLD queries' ethernet source address bridge: Allow mcast snooping for transient link local addresses too ipv6: Add IPv6 multicast address flag defines bridge: Add missing ntohs()s for MLDv2 report parsing bridge: Fix IPv6 multicast snooping by correcting offset in MLDv2 report bridge: Fix IPv6 multicast snooping by storing correct protocol type p54pci: update receive dma buffers before and after processing fix cfg80211_wext_siwfreq lock ordering... rt2x00: Fix WPA TKIP Michael MIC failures. ath5k: Fix fast channel switching tcp: undo_retrans counter fixes ...
Diffstat (limited to 'net/ipv4/inet_timewait_sock.c')
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index c5af909cf701..3c8dfa16614d 100644
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -505,7 +505,9 @@ restart:
+ local_bh_disable();
inet_twsk_deschedule(tw, twdr);
+ local_bh_enable();
goto restart_rcu;