From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 23 Apr 2007 06:22:24 +0000 (-0700)
Subject: [NET]: Prevent much sadness in qdisc_lock_tree().
X-Git-Tag: v2.6.22-rc1~1128^2~74
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=372cc74c8b41d808af0a3fa8b11795cba79e7299;p=linux-2.6

[NET]: Prevent much sadness in qdisc_lock_tree().

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index f3b99701da..18c51b40f6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3016,9 +3016,7 @@ int register_netdevice(struct net_device *dev)
 	spin_lock_init(&dev->queue_lock);
 	spin_lock_init(&dev->_xmit_lock);
 	dev->xmit_lock_owner = -1;
-#ifdef CONFIG_NET_CLS_ACT
 	spin_lock_init(&dev->ingress_lock);
-#endif
 
 	dev->iflink = -1;