From 398a895ed9ccc25967e3e0293f035d0027f44032 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Thu, 30 Oct 2008 14:00:53 -0700
Subject: [PATCH] --- yaml --- r: 121534 b: refs/heads/master c:
 c8db3fec5b02f4cefe441903fe1c142ff14e1771 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv4/udp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 39a316db49ce..282674846bcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cf14e38372d84ea09ba45fb60b61f6e36c18546
+refs/heads/master: c8db3fec5b02f4cefe441903fe1c142ff14e1771
diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
index c3ecec8a9e1c..f760b86e7530 100644
--- a/trunk/net/ipv4/udp.c
+++ b/trunk/net/ipv4/udp.c
@@ -970,12 +970,12 @@ void udp_lib_unhash(struct sock *sk)
 	unsigned int hash = udp_hashfn(sock_net(sk), sk->sk_hash);
 	struct udp_hslot *hslot = &udptable->hash[hash];
 
-	spin_lock(&hslot->lock);
+	spin_lock_bh(&hslot->lock);
 	if (sk_del_node_init_rcu(sk)) {
 		inet_sk(sk)->num = 0;
 		sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
 	}
-	spin_unlock(&hslot->lock);
+	spin_unlock_bh(&hslot->lock);
 }
 EXPORT_SYMBOL(udp_lib_unhash);