diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-06 09:58:21 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-06 09:58:21 -0500 |
| commit | 3b14d86eed3c042db718c7e006ca5299f473c88e (patch) | |
| tree | 4efde6b2d77f5229ace3375da3471b0db1daa695 /ripngd/ripng_zebra.c | |
| parent | 0b0038b8bcf84beda44fb69a60b2620b0387d8e8 (diff) | |
| parent | 7d53a49360ddceb16db34bc8a84039cb2ecab22c (diff) | |
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'ripngd/ripng_zebra.c')
| -rw-r--r-- | ripngd/ripng_zebra.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index 09472683d7..c5096305e4 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -317,7 +317,7 @@ DEFUN (ripng_redistribute_type, ripng_redistribute_type_cmd, "redistribute <kernel|connected|static|ospf6|isis|bgp|table>", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD) + FRR_REDIST_HELP_STR_RIPNGD) { int type; @@ -338,7 +338,7 @@ DEFUN (no_ripng_redistribute_type, "no redistribute <kernel|connected|static|ospf6|isis|bgp|table> [metric (0-16)] [route-map WORD]", NO_STR "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Metric\n" "Metric value\n" "Route map reference\n" @@ -363,7 +363,7 @@ DEFUN (ripng_redistribute_type_metric, ripng_redistribute_type_metric_cmd, "redistribute <kernel|connected|static|ospf6|isis|bgp|table> metric (0-16)", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Metric\n" "Metric value\n") { @@ -387,12 +387,11 @@ DEFUN (ripng_redistribute_type_metric, return CMD_SUCCESS; } - DEFUN (ripng_redistribute_type_routemap, ripng_redistribute_type_routemap_cmd, "redistribute <kernel|connected|static|ospf6|isis|bgp|table> route-map WORD", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Route map reference\n" "Pointer to route-map entries\n") { @@ -414,12 +413,11 @@ DEFUN (ripng_redistribute_type_routemap, return CMD_SUCCESS; } - DEFUN (ripng_redistribute_type_metric_routemap, ripng_redistribute_type_metric_routemap_cmd, "redistribute <kernel|connected|static|ospf6|isis|bgp|table> metric (0-16) route-map WORD", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Metric\n" "Metric value\n" "Route map reference\n" @@ -446,7 +444,6 @@ DEFUN (ripng_redistribute_type_metric_routemap, return CMD_SUCCESS; } - void ripng_redistribute_write (struct vty *vty, int config_mode) { |