From: David S. Miller <davem@davemloft.net>
Date: Fri, 28 Mar 2008 22:53:11 +0000 (-0700)
Subject: [NET]: Protect device namespace inlines with CONFIG_NET
X-Git-Tag: v2.6.26-rc1~1138^2~286
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1567ca7eec7664b8be3b07755ac59dc1b1ec76cb;p=linux-2.6

[NET]: Protect device namespace inlines with CONFIG_NET

Include sites should not be bothered by whether
CONFIG_NET is set or not when trying to include
benign files like linux/etherdevice.h et al.

From a report by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3b54f8a2c0..8576ca928d 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -741,6 +741,7 @@ struct net_device
 #define	NETDEV_ALIGN		32
 #define	NETDEV_ALIGN_CONST	(NETDEV_ALIGN - 1)
 
+#ifdef CONFIG_NET
 /*
  * Net namespace inlines
  */
@@ -761,6 +762,7 @@ void dev_net_set(struct net_device *dev, struct net *net)
 	dev->nd_net = net;
 #endif
 }
+#endif
 
 /**
  *	netdev_priv - access network device private data