X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fcore%2Fdev.c;h=18c51b40f6657170d8d9ec8e574278aa0a733706;hb=372cc74c8b41d808af0a3fa8b11795cba79e7299;hp=f3b99701da5bef2adeec42e475ea26bcc85c4722;hpb=97fc8d0bc58cd09e62dc06ea5a64b58841738934;p=linux-2.6 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;