From a86a51926c80e71c95faddd6eddf592637a6abea Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 18 Sep 2006 00:22:30 -0700
Subject: [PATCH] --- yaml --- r: 33976 b: refs/heads/master c:
 d7811e623dd4be3e3bdba2d6330f7f15541ee45f h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/net/sched/sch_generic.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7b93d3541f59..c9f3a5bbd6a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbe21d8fefca605b90e34f0f019505e599712f9b
+refs/heads/master: d7811e623dd4be3e3bdba2d6330f7f15541ee45f
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index 0834c2ee9174..6f9151899795 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/net/sched/sch_generic.c
@@ -238,9 +238,7 @@ void __netdev_watchdog_up(struct net_device *dev)
 
 static void dev_watchdog_up(struct net_device *dev)
 {
-	netif_tx_lock_bh(dev);
 	__netdev_watchdog_up(dev);
-	netif_tx_unlock_bh(dev);
 }
 
 static void dev_watchdog_down(struct net_device *dev)