diff options
-rw-r--r-- | arch/um/drivers/net_kern.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 8c01fa81a1ae..73681f14f9fc 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -753,6 +753,7 @@ static struct mc_device net_mc = { | |||
753 | .remove = net_remove, | 753 | .remove = net_remove, |
754 | }; | 754 | }; |
755 | 755 | ||
756 | #ifdef CONFIG_INET | ||
756 | static int uml_inetaddr_event(struct notifier_block *this, unsigned long event, | 757 | static int uml_inetaddr_event(struct notifier_block *this, unsigned long event, |
757 | void *ptr) | 758 | void *ptr) |
758 | { | 759 | { |
@@ -789,14 +790,13 @@ struct notifier_block uml_inetaddr_notifier = { | |||
789 | .notifier_call = uml_inetaddr_event, | 790 | .notifier_call = uml_inetaddr_event, |
790 | }; | 791 | }; |
791 | 792 | ||
792 | static int uml_net_init(void) | 793 | static void inet_register(void) |
793 | { | 794 | { |
794 | struct list_head *ele; | 795 | struct list_head *ele; |
795 | struct uml_net_private *lp; | 796 | struct uml_net_private *lp; |
796 | struct in_device *ip; | 797 | struct in_device *ip; |
797 | struct in_ifaddr *in; | 798 | struct in_ifaddr *in; |
798 | 799 | ||
799 | mconsole_register_dev(&net_mc); | ||
800 | register_inetaddr_notifier(¨_inetaddr_notifier); | 800 | register_inetaddr_notifier(¨_inetaddr_notifier); |
801 | 801 | ||
802 | /* Devices may have been opened already, so the uml_inetaddr_notifier | 802 | /* Devices may have been opened already, so the uml_inetaddr_notifier |
@@ -816,7 +816,17 @@ static int uml_net_init(void) | |||
816 | } | 816 | } |
817 | } | 817 | } |
818 | spin_unlock(&opened_lock); | 818 | spin_unlock(&opened_lock); |
819 | } | ||
820 | #else | ||
821 | static inline void inet_register(void) | ||
822 | { | ||
823 | } | ||
824 | #endif | ||
819 | 825 | ||
826 | static int uml_net_init(void) | ||
827 | { | ||
828 | mconsole_register_dev(&net_mc); | ||
829 | inet_register(); | ||
820 | return 0; | 830 | return 0; |
821 | } | 831 | } |
822 | 832 | ||