Merge branch 'master' of ssh://git.nic.cz/bird

7 files changed, 6 insertions, 92 deletions

diff --git a/sysdep/cf/README b/sysdep/cf/README
index 3b5bcd4f..1c11edcf 100644
--- a/sysdep/cf/README
+++ b/sysdep/cf/README
@@ -5,19 +5,9 @@ CONFIG_AUTO_ROUTES	Device routes are added automagically by the kernel
 CONFIG_SELF_CONSCIOUS	We're able to recognize whether route was installed by us
 CONFIG_MULTIPLE_TABLES	The kernel supports multiple routing tables
 CONFIG_ALL_TABLES_AT_ONCE	Kernel scanner wants to process all tables at once
-CONFIG_MC_PROPER_SRC	Multicast packets have source address according to socket saddr field
-CONFIG_RESTRICTED_PRIVILEGES	Implements restricted privileges using drop_uid()
 
-CONFIG_UNIX_IFACE	Use Unix interface scanner
-CONFIG_UNIX_SET		Use Unix route setting
-CONFIG_UNIX_DONTROUTE   Use setsockopts DONTROUTE (undef for *BSD)
+CONFIG_MC_PROPER_SRC	Multicast packets have source address according to socket saddr field
 CONFIG_SKIP_MC_BIND	Don't call bind on multicast socket (def for *BSD)
-CONFIG_LINUX_SCAN	Use Linux /proc/net/route scanner
-
-CONFIG_ALL_MULTICAST	krt-iface: All devices support multicasting (i.e., ignore IFF_MULTICAST)
-CONFIG_UNNUM_MULTICAST	krt-iface: We support multicasts on unnumbered PtP devices
-
-CONFIG_LINUX_MC_MREQN	Linux: Use struct mreqn for multicasting
-CONFIG_LINUX_MC_MREQ	Linux: Use struct mreq
-CONFIG_LINUX_MC_MREQ_BIND	Linux: Use struct mreq and SO_BINDTODEVICE
+CONFIG_UNIX_DONTROUTE	Use setsockopts DONTROUTE (undef for *BSD)
 
+CONFIG_RESTRICTED_PRIVILEGES	Implements restricted privileges using drop_uid()
diff --git a/sysdep/cf/bsd-v6.h b/sysdep/cf/bsd-v6.h
index 66985abf..b7f25f64 100644
--- a/sysdep/cf/bsd-v6.h
+++ b/sysdep/cf/bsd-v6.h
@@ -10,14 +10,8 @@
 
 #define CONFIG_AUTO_ROUTES
 #define CONFIG_SELF_CONSCIOUS
-#undef CONFIG_MULTIPLE_TABLES
-
-#undef CONFIG_UNIX_IFACE
-#undef CONFIG_UNIX_SET
 
 #define CONFIG_SKIP_MC_BIND
-#define CONFIG_ALL_MULTICAST
-#define CONFIG_UNNUM_MULTICAST
 
 /*
 Link: sysdep/unix
diff --git a/sysdep/cf/bsd.h b/sysdep/cf/bsd.h
index acd1b58b..e7cc135f 100644
--- a/sysdep/cf/bsd.h
+++ b/sysdep/cf/bsd.h
@@ -8,15 +8,8 @@
 
 #define CONFIG_AUTO_ROUTES
 #define CONFIG_SELF_CONSCIOUS
-#undef CONFIG_MULTIPLE_TABLES
-
-#undef CONFIG_UNIX_IFACE
-#undef CONFIG_UNIX_SET
-#undef CONFIG_UNIX_DONTROUTE
 
 #define CONFIG_SKIP_MC_BIND
-#define CONFIG_ALL_MULTICAST
-#define CONFIG_UNNUM_MULTICAST
 
 /*
 Link: sysdep/unix
diff --git a/sysdep/cf/linux-20.h b/sysdep/cf/linux-20.h
deleted file mode 100644
index e409706a..00000000
--- a/sysdep/cf/linux-20.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *	Configuration for Linux 2.0 based systems
- *
- *	(c) 1998--1999 Martin Mares <mj@ucw.cz>
- *
- *	Can be freely distributed and used under the terms of the GNU GPL.
- */
-
-#undef CONFIG_AUTO_ROUTES
-#undef CONFIG_SELF_CONSCIOUS
-#undef CONFIG_MULTIPLE_TABLES
-
-#define CONFIG_UNIX_IFACE
-#define CONFIG_UNIX_SET
-#define CONFIG_UNIX_DONTROUTE
-#undef CONFIG_SKIP_MC_BIND
-#define CONFIG_LINUX_SCAN
-
-#define CONFIG_LINUX_MC_MREQ_BIND
-#define CONFIG_ALL_MULTICAST
-#define CONFIG_UNNUM_MULTICAST
-
-/*
-Link: sysdep/linux
-Link: sysdep/unix
- */
diff --git a/sysdep/cf/linux-21.h b/sysdep/cf/linux-21.h
deleted file mode 100644
index 0fce7053..00000000
--- a/sysdep/cf/linux-21.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *	Configuration for Linux 2.1/2.2 based systems without Netlink
- *
- *	(c) 1998--1999 Martin Mares <mj@ucw.cz>
- *
- *	Can be freely distributed and used under the terms of the GNU GPL.
- */
-
-#define CONFIG_AUTO_ROUTES
-#undef CONFIG_SELF_CONSCIOUS
-#undef CONFIG_MULTIPLE_TABLES
-
-#define CONFIG_UNIX_IFACE
-#define CONFIG_UNIX_SET
-#define CONFIG_UNIX_DONTROUTE
-#undef CONFIG_SKIP_MC_BIND
-#define CONFIG_LINUX_SCAN
-
-#define CONFIG_LINUX_MC_MREQN
-#define CONFIG_ALL_MULTICAST
-#define CONFIG_UNNUM_MULTICAST
-
-/*
-Link: sysdep/linux
-Link: sysdep/unix
- */
diff --git a/sysdep/cf/linux-v6.h b/sysdep/cf/linux-v6.h
index 467d7728..09f60377 100644
--- a/sysdep/cf/linux-v6.h
+++ b/sysdep/cf/linux-v6.h
@@ -1,5 +1,5 @@
 /*
- *	Configuration for Linux 2.2 based systems running IPv6
+ *	Configuration for Linux based systems running IPv6
  *
  *	(c) 1998--1999 Martin Mares <mj@ucw.cz>
  *
@@ -9,20 +9,13 @@
 #define IPV6
 
 #define CONFIG_AUTO_ROUTES
-#define CONFIG_ALL_MULTICAST
 #define CONFIG_SELF_CONSCIOUS
-
-/*
- *  Netlink supports multiple tables, but kernel IPv6 code doesn't, so we
- *  treat it as a multiple table system with number of tables set to 1.
- */
 #define CONFIG_MULTIPLE_TABLES
 #define CONFIG_ALL_TABLES_AT_ONCE
 
 #define CONFIG_RESTRICTED_PRIVILEGES
 
 /*
-Link: sysdep/linux/netlink
 Link: sysdep/linux
 Link: sysdep/unix
  */
diff --git a/sysdep/cf/linux-22.h b/sysdep/cf/linux.h
index 51b339d1..9e34f869 100644
--- a/sysdep/cf/linux-22.h
+++ b/sysdep/cf/linux.h
@@ -1,5 +1,5 @@
 /*
- *	Configuration for Linux 2.2 based systems
+ *	Configuration for Linux based systems
  *
  *	(c) 1998--1999 Martin Mares <mj@ucw.cz>
  *
@@ -10,17 +10,13 @@
 #define CONFIG_SELF_CONSCIOUS
 #define CONFIG_MULTIPLE_TABLES
 #define CONFIG_ALL_TABLES_AT_ONCE
-#define CONFIG_MC_PROPER_SRC
-
-#undef CONFIG_SKIP_MC_BIND
 
-#define CONFIG_LINUX_MC_MREQN
+#define CONFIG_MC_PROPER_SRC
 #define CONFIG_UNIX_DONTROUTE
 
 #define CONFIG_RESTRICTED_PRIVILEGES
 
 /*
-Link: sysdep/linux/netlink
 Link: sysdep/linux
 Link: sysdep/unix
  */