summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-03-28 15:53:11 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-28 15:53:11 -0700
commit1567ca7eec7664b8be3b07755ac59dc1b1ec76cb (patch)
tree8df2dcce884a6fee6d6cdb87ca9d3d7ad8b23675 /include
parent0736ffc04eec239cce9fd3c6ae5dce54e14c25c7 (diff)
[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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/netdevice.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3b54f8a2c05..8576ca928da 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