[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:1567ca7eec
3edf8fa5cc
2d38f9a4f8
Revert them. Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e1ec1b8ccd
commit
a4aa834a91
@ -741,7 +741,6 @@ struct net_device
|
||||
#define NETDEV_ALIGN 32
|
||||
#define NETDEV_ALIGN_CONST (NETDEV_ALIGN - 1)
|
||||
|
||||
#ifdef CONFIG_NET
|
||||
/*
|
||||
* Net namespace inlines
|
||||
*/
|
||||
@ -762,7 +761,6 @@ void dev_net_set(struct net_device *dev, struct net *net)
|
||||
dev->nd_net = net;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* netdev_priv - access network device private data
|
||||
@ -827,7 +825,6 @@ struct packet_type {
|
||||
extern rwlock_t dev_base_lock; /* Device list lock */
|
||||
|
||||
|
||||
#ifdef CONFIG_NET
|
||||
#define for_each_netdev(net, d) \
|
||||
list_for_each_entry(d, &(net)->dev_base_head, dev_list)
|
||||
#define for_each_netdev_safe(net, d, n) \
|
||||
@ -851,7 +848,6 @@ static inline struct net_device *first_net_device(struct net *net)
|
||||
return list_empty(&net->dev_base_head) ? NULL :
|
||||
net_device_entry(net->dev_base_head.next);
|
||||
}
|
||||
#endif
|
||||
|
||||
extern int netdev_boot_setup_check(struct net_device *dev);
|
||||
extern unsigned long netdev_boot_base(const char *prefix, int unit);
|
||||
|
@ -60,11 +60,12 @@ struct net {
|
||||
};
|
||||
|
||||
|
||||
#ifdef CONFIG_NET
|
||||
#include <linux/seq_file_net.h>
|
||||
|
||||
/* Init's network namespace */
|
||||
extern struct net init_net;
|
||||
|
||||
#ifdef CONFIG_NET
|
||||
#define INIT_NET_NS(net_ns) .net_ns = &init_net,
|
||||
|
||||
extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns);
|
||||
|
@ -19,12 +19,10 @@
|
||||
#include <linux/kobject.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#ifdef CONFIG_NET
|
||||
#include <linux/socket.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/netlink.h>
|
||||
#include <net/sock.h>
|
||||
#endif
|
||||
|
||||
|
||||
u64 uevent_seqnum;
|
||||
|
Loading…
Reference in New Issue
Block a user