Skip to content

Commit

Permalink
uml: fix build for !CONFIG_TCP
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Nov 15, 2007
1 parent ee1eca5 commit 32f862c
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions arch/um/drivers/net_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,7 @@ static struct mc_device net_mc = {
.remove = net_remove,
};

#ifdef CONFIG_INET
static int uml_inetaddr_event(struct notifier_block *this, unsigned long event,
void *ptr)
{
Expand Down Expand Up @@ -789,14 +790,13 @@ struct notifier_block uml_inetaddr_notifier = {
.notifier_call = uml_inetaddr_event,
};

static int uml_net_init(void)
static void inet_register(void)
{
struct list_head *ele;
struct uml_net_private *lp;
struct in_device *ip;
struct in_ifaddr *in;

mconsole_register_dev(&net_mc);
register_inetaddr_notifier(&uml_inetaddr_notifier);

/* Devices may have been opened already, so the uml_inetaddr_notifier
Expand All @@ -816,7 +816,17 @@ static int uml_net_init(void)
}
}
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;
}

Expand Down

0 comments on commit 32f862c

Please sign in to comment.