diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-20 16:31:49 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-20 16:31:49 +0000 |
| commit | 0a538fc98fb662b4cf2d927ac29fd9af4a4fab03 (patch) | |
| tree | f6dbe2af92d44f9a77e4802cefb440811dd69584 /zebra/kernel_null.c | |
| parent | e52702f29d003585dcfbb4914b2a52d77a177739 (diff) | |
| parent | 41246cb61418102f9f3bfa3e0acfce90c7798e67 (diff) | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
isisd/isis_routemap.c
zebra/rt_netlink.c
Diffstat (limited to 'zebra/kernel_null.c')
| -rw-r--r-- | zebra/kernel_null.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/zebra/kernel_null.c b/zebra/kernel_null.c index 0770ab0bb2..a20597882c 100644 --- a/zebra/kernel_null.c +++ b/zebra/kernel_null.c @@ -32,13 +32,7 @@ #include "zebra/rt_netlink.h" #include "zebra/rib.h" -int kernel_add_ipv4 (struct prefix *a, struct rib *b) { return 0; } -int kernel_update_ipv4 (struct prefix *a, struct rib *b) { return 0; } -int kernel_delete_ipv4 (struct prefix *a, struct rib *b) { return 0; } - -int kernel_add_ipv6 (struct prefix *a, struct rib *b) { return 0; } -int kernel_update_ipv6 (struct prefix *a, struct rib *b) { return 0; } -int kernel_delete_ipv6 (struct prefix *a, struct rib *b) { return 0; } +int kernel_route_rib (struct prefix *a, struct rib *old, struct rib *new) { return 0; } int kernel_address_add_ipv4 (struct interface *a, struct connected *b) { |