diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
| commit | 2d8270596a085e7a815cebaea21e17cba9e26111 (patch) | |
| tree | f9a559f654e7d704ecacc9dadedbe01868615610 /ospf6d/ospf6_interface.c | |
| parent | 625e016d14073dfefb69c0fa36cddb81fbe034ed (diff) | |
| parent | 905c15079393987f8cfdd55c30e7e1a3248c8c48 (diff) | |
Merge remote-tracking branch 'frr/master' into newline-redux
Lots of conflicts from CMD_WARNING_CONFIG_FAILED...
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospf6d/ospf6_interface.c')
| -rw-r--r-- | ospf6d/ospf6_interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index adfc148795..d647b94df6 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -1137,7 +1137,7 @@ DEFUN (ipv6_ospf6_ifmtu, { vty_out (vty, "%s's ospf6 ifmtu cannot go beyond physical mtu (%d)\n", ifp->name, ifp->mtu6); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } if (oi->ifmtu < ifmtu) @@ -1241,7 +1241,7 @@ DEFUN (ipv6_ospf6_cost, if (lcost > UINT32_MAX) { vty_out (vty, "Cost %ld is out of range\n", lcost); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } if (oi->cost == lcost) @@ -1298,7 +1298,7 @@ DEFUN (auto_cost_reference_bandwidth, if (refbw < 1 || refbw > 4294967) { vty_out (vty, "reference-bandwidth value is invalid\n"); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } /* If reference bandwidth is changed. */ |