leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uml: fix build for !CONFIG_TCP

Browse Source 
Make UML build in the absence of CONFIG_INET by making the inetaddr_notifier
registration depend on it.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike 2007-11-14 17:00:28 -08:00 committed by Linus Torvalds
parent ee1eca5d24
commit 32f862c310
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/um/drivers/net_kern.c
View File

@ -753,6 +753,7 @@ static struct mc_device net_mc = {
.remove = net_remove, .remove = net_remove,
}; };
#ifdef CONFIG_INET
static int uml_inetaddr_event(struct notifier_block *this, unsigned long event, static int uml_inetaddr_event(struct notifier_block *this, unsigned long event,
void *ptr) void *ptr)
{ {
@ -789,14 +790,13 @@ struct notifier_block uml_inetaddr_notifier = {
.notifier_call = uml_inetaddr_event, .notifier_call = uml_inetaddr_event,
}; };
static int uml_net_init(void) static void inet_register(void)
{ {
struct list_head *ele; struct list_head *ele;
struct uml_net_private *lp; struct uml_net_private *lp;
struct in_device *ip; struct in_device *ip;
struct in_ifaddr *in; struct in_ifaddr *in;
mconsole_register_dev(&net_mc);
register_inetaddr_notifier(&uml_inetaddr_notifier); register_inetaddr_notifier(&uml_inetaddr_notifier);
/* Devices may have been opened already, so the uml_inetaddr_notifier /* Devices may have been opened already, so the uml_inetaddr_notifier
@ -816,7 +816,17 @@ static int uml_net_init(void)
} }
} }
spin_unlock(&opened_lock); spin_unlock(&opened_lock);
}
#else
static inline void inet_register(void)
{
}
#endif
static int uml_net_init(void)
{
mconsole_register_dev(&net_mc);
inet_register();
return 0; return 0;
} }