summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-04-22 23:22:24 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:29:38 -0700
commit372cc74c8b41d808af0a3fa8b11795cba79e7299 (patch)
tree6ffe11a5f180415c5bd8fe2aeb5cd31a2341ef28
parent97fc8d0bc58cd09e62dc06ea5a64b58841738934 (diff)
downloadop-kernel-dev-372cc74c8b41d808af0a3fa8b11795cba79e7299.zip
op-kernel-dev-372cc74c8b41d808af0a3fa8b11795cba79e7299.tar.gz
[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>
-rw-r--r--net/core/dev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index f3b9970..18c51b4 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;
OpenPOWER on IntegriCloud