summaryrefslogtreecommitdiffstats
path: root/zebra/kernel_null.c
diff options
context:
space:
mode:
authorRick Balocca <rbalocca@vyatta.com>2008-10-16 17:39:55 -0700
committerRick Balocca <rbalocca@vyatta.com>2008-10-16 17:39:55 -0700
commit04c7298b3684ddda4e6669f14374e2377deb04ea (patch)
treeb3c11943294ffc282863dbca418d408a7869f86f /zebra/kernel_null.c
parent1581cf27e9e187a12f25221cc42123a056469adb (diff)
parentfa3e86a1a7559808ba5e32374e35d387472567c8 (diff)
downloadquagga-04c7298b3684ddda4e6669f14374e2377deb04ea.tar.bz2
quagga-04c7298b3684ddda4e6669f14374e2377deb04ea.tar.xz
Merge branch 'islavista'
Conflicts: debian/changelog
Diffstat (limited to 'zebra/kernel_null.c')
-rw-r--r--zebra/kernel_null.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/kernel_null.c b/zebra/kernel_null.c
index 94b7b3c7..c72bbd09 100644
--- a/zebra/kernel_null.c
+++ b/zebra/kernel_null.c
@@ -12,9 +12,9 @@ int kernel_add_ipv4 (struct prefix *a, struct rib *b) { return 0; }
#pragma weak kernel_delete_ipv4 = kernel_add_ipv4
int kernel_add_ipv6 (struct prefix *a, struct rib *b) { return 0; }
#pragma weak kernel_delete_ipv6 = kernel_add_ipv6
-int kernel_delete_ipv6_old (struct prefix_ipv6 *dest, struct in6_addr *gate,
- unsigned int index, int flags, int table)
-{ return 0; }
+void kernel_delete_ipv6_old (struct prefix_ipv6 *dest, struct in6_addr *gate,
+ unsigned int index, int table)
+{ }
int kernel_add_route (struct prefix_ipv4 *a, struct in_addr *b, int c, int d)
{ return 0; }