diff options
author | Denis V. Lunev <den@openvz.org> | 2008-04-03 16:04:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-03 16:04:33 -0400 |
commit | a4aa834a9165150252c5cd953faab4de29d51b87 (patch) | |
tree | e96e20355057dfabd279b7b7c94fedeffed4e020 /include/linux/netdevice.h | |
parent | e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (diff) |
[NETNS]: Declare init_net even without CONFIG_NET defined.
This does not look good, but there is no other choice. The compilation
without CONFIG_NET is broken and can not be fixed with ease.
After that there is no need for the following commits:
1567ca7eec7664b8be3b07755ac59dc1b1ec76cb
3edf8fa5ccf10688a9280b5cbca8ed3947c42866
2d38f9a4f8d2ebdc799f03eecf82345825495711
Revert them.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c36c76caf20b..8b17ed40dea2 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -741,7 +741,6 @@ struct net_device | |||
741 | #define NETDEV_ALIGN 32 | 741 | #define NETDEV_ALIGN 32 |
742 | #define NETDEV_ALIGN_CONST (NETDEV_ALIGN - 1) | 742 | #define NETDEV_ALIGN_CONST (NETDEV_ALIGN - 1) |
743 | 743 | ||
744 | #ifdef CONFIG_NET | ||
745 | /* | 744 | /* |
746 | * Net namespace inlines | 745 | * Net namespace inlines |
747 | */ | 746 | */ |
@@ -762,7 +761,6 @@ void dev_net_set(struct net_device *dev, struct net *net) | |||
762 | dev->nd_net = net; | 761 | dev->nd_net = net; |
763 | #endif | 762 | #endif |
764 | } | 763 | } |
765 | #endif | ||
766 | 764 | ||
767 | /** | 765 | /** |
768 | * netdev_priv - access network device private data | 766 | * netdev_priv - access network device private data |
@@ -827,7 +825,6 @@ struct packet_type { | |||
827 | extern rwlock_t dev_base_lock; /* Device list lock */ | 825 | extern rwlock_t dev_base_lock; /* Device list lock */ |
828 | 826 | ||
829 | 827 | ||
830 | #ifdef CONFIG_NET | ||
831 | #define for_each_netdev(net, d) \ | 828 | #define for_each_netdev(net, d) \ |
832 | list_for_each_entry(d, &(net)->dev_base_head, dev_list) | 829 | list_for_each_entry(d, &(net)->dev_base_head, dev_list) |
833 | #define for_each_netdev_safe(net, d, n) \ | 830 | #define for_each_netdev_safe(net, d, n) \ |
@@ -851,7 +848,6 @@ static inline struct net_device *first_net_device(struct net *net) | |||
851 | return list_empty(&net->dev_base_head) ? NULL : | 848 | return list_empty(&net->dev_base_head) ? NULL : |
852 | net_device_entry(net->dev_base_head.next); | 849 | net_device_entry(net->dev_base_head.next); |
853 | } | 850 | } |
854 | #endif | ||
855 | 851 | ||
856 | extern int netdev_boot_setup_check(struct net_device *dev); | 852 | extern int netdev_boot_setup_check(struct net_device *dev); |
857 | extern unsigned long netdev_boot_base(const char *prefix, int unit); | 853 | extern unsigned long netdev_boot_base(const char *prefix, int unit); |