Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32f862c3 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: fix build for !CONFIG_TCP 



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

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ee1eca5d

arch/um/drivers/net_kern.c

+12 −2
Original line number Diff line number Diff line
@@ -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)

{
@@ -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
@@ -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;

}