diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
| commit | b58ed1f8a89ea32c2380bf79057e5333109d72d4 (patch) | |
| tree | a9ead45b8895edce92ab69621a52816b45725e36 /zebra/zserv.c | |
| parent | 01cb1466423363a2f8b42246464feb3858df1c9f (diff) | |
| parent | 5551c072e187c76c3d6a885cd043d6db811bab23 (diff) | |
Merge remote-tracking branch 'origin/master' into pim_lib_work2
Diffstat (limited to 'zebra/zserv.c')
| -rw-r--r-- | zebra/zserv.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/zebra/zserv.c b/zebra/zserv.c index 38680a312e..b069c996c0 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -2542,7 +2542,6 @@ DEFUN (show_ip_forwarding, return CMD_SUCCESS; } -#ifdef HAVE_IPV6 /* Only display ipv6 forwarding is enabled or not. */ DEFUN (show_ipv6_forwarding, show_ipv6_forwarding_cmd, @@ -2616,8 +2615,6 @@ DEFUN (no_ipv6_forwarding, return CMD_SUCCESS; } -#endif /* HAVE_IPV6 */ - /* IPForwarding configuration write function. */ static int config_write_forwarding (struct vty *vty) @@ -2627,10 +2624,8 @@ config_write_forwarding (struct vty *vty) if (!ipforward ()) vty_out (vty, "no ip forwarding%s", VTY_NEWLINE); -#ifdef HAVE_IPV6 if (!ipforward_ipv6 ()) vty_out (vty, "no ipv6 forwarding%s", VTY_NEWLINE); -#endif /* HAVE_IPV6 */ vty_out (vty, "!%s", VTY_NEWLINE); return 0; } @@ -2688,11 +2683,9 @@ zebra_init (void) install_element (CONFIG_NODE, &no_config_table_cmd); #endif /* HAVE_NETLINK */ -#ifdef HAVE_IPV6 install_element (VIEW_NODE, &show_ipv6_forwarding_cmd); install_element (CONFIG_NODE, &ipv6_forwarding_cmd); install_element (CONFIG_NODE, &no_ipv6_forwarding_cmd); -#endif /* HAVE_IPV6 */ /* Route-map */ zebra_route_map_init (); |