From: Martin Mares <mj@ucw.cz>
Date: Mon, 1 Mar 1999 19:05:58 +0000 (+0000)
Subject: Use traditional Unix route/iface interface only when CONFIG_NETLINK
X-Git-Tag: v1.2.0~1695
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=025d14cd5a0909b534762e5a50bfef97c2b4c9ee;p=thirdparty%2Fbird.git

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 6244479f9..6af70552d 100644
--- 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 2969ee45c..e2ff0f854 100644
--- 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 9b630b27e..cebf3354a 100644
--- 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 e5271021b..7b338714e 100644
--- 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