Use traditional Unix route/iface interface only when CONFIG_NETLINK

is not defined. Also moved declarations of Unix iface logic to krt.h.

diff --git a/sysdep/linux/Modules b/sysdep/linux/Modules
index 6244479f926038fce2173ccb00b55df549ee4317..6af70552dbc48b3eb1d648a67cbf245063742ab8 100644 (file)
--- a/sysdep/linux/Modules
+++ b/sysdep/linux/Modules
@@ -1,3 +1,7 @@
+#ifdef CONFIG_NETLINK
+netlink.c
+#else
 krt-scan.c
 krt-scan.h
 krt-scan.Y
+#endif

diff --git a/sysdep/unix/Modules b/sysdep/unix/Modules
index 2969ee45c6f8a529a8294702fc1a0cce0be058ba..e2ff0f8549de92bd2940255245c53da8562662a3 100644 (file)
--- a/sysdep/unix/Modules
+++ b/sysdep/unix/Modules
@@ -3,6 +3,8 @@ main.c
 timer.h
 io.c
 unix.h
+
+#ifndef CONFIG_NETLINK
 sync-if.c
 sync-rt.c
 krt.Y
@@ -12,3 +14,4 @@ krt-set.h
 krt-set.Y
 krt-iface.h
 krt-iface.Y
+#endif

diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index 9b630b27e7b634e1902c53696373ebd8fcc401ea..cebf3354a82c80f9131bb14712b3415a41d7881c 100644 (file)
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -56,6 +56,11 @@ void krt_set_shutdown(struct krt_proto *);
 
 /* sync-if.c */
 
+extern int if_scan_sock;
+extern int if_scan_period;
+
+void scan_if_init(void);
+
 void krt_if_preconfig(struct krt_config *);
 void krt_if_start(struct krt_proto *);
 void krt_if_shutdown(struct krt_proto *);

diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index e5271021b82b2b9f34da42d2fe3e4bdab225d27f..7b338714e1cdf1cff2be93468689afc31acbc4c4 100644 (file)
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -26,11 +26,4 @@ void io_loop(void);
 void fill_in_sockaddr(struct sockaddr_in *sa, ip_addr a, unsigned port);
 void get_sockaddr(struct sockaddr_in *sa, ip_addr *a, unsigned *port);
 
-/* sync-if.c */
-
-extern int if_scan_sock;
-extern int if_scan_period;
-
-void scan_if_init(void);
-
 #endif