diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-21 21:27:49 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-21 21:27:49 +0200 |
| commit | 39e92c066f210b0b550489e98d3b767ee1553e52 (patch) | |
| tree | 70928b277635d25cb717b8ceb103dd1d5e26f732 /isisd | |
| parent | lib: Clean up some bgp show functions (diff) | |
| parent | vtysh: handle case if there is no match in "write terminal $daemon" (diff) | |
| download | frr-39e92c066f210b0b550489e98d3b767ee1553e52.tar.xz frr-39e92c066f210b0b550489e98d3b767ee1553e52.zip | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
bgpd/bgp_encap.c
bgpd/bgp_route.c
lib/command.c
lib/command.h
ospf6d/ospf6d.c
vtysh/vtysh.c
Diffstat (limited to 'isisd')
| -rw-r--r-- | isisd/isis_circuit.c | 2 | ||||
| -rw-r--r-- | isisd/isis_routemap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index c66fa4826..c2b7ec750 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -979,7 +979,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty, vty_out(vty, " %s%s", buf, VTY_NEWLINE); } } - if (circuit->ipv6_link && listcount(circuit->ipv6_non_link) > 0) + if (circuit->ipv6_non_link && listcount(circuit->ipv6_non_link) > 0) { vty_out(vty, " IPv6 Prefixes:%s", VTY_NEWLINE); for (ALL_LIST_ELEMENTS_RO(circuit->ipv6_non_link, node, ip_addr)) diff --git a/isisd/isis_routemap.c b/isisd/isis_routemap.c index 1d734fbc2..61f3315f0 100644 --- a/isisd/isis_routemap.c +++ b/isisd/isis_routemap.c @@ -230,7 +230,7 @@ route_set_metric_compile(const char *arg) if (arg[0] == '\0' || *endp != '\0' || metric > MAX_WIDE_PATH_METRIC) return NULL; - ret = XCALLOC(MTYPE_ROUTE_MAP_COMPILED, sizeof(ret)); + ret = XCALLOC(MTYPE_ROUTE_MAP_COMPILED, sizeof(*ret)); *ret = metric; return ret; |