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 /ospfd | |
| 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 'ospfd')
| -rw-r--r-- | ospfd/ospf_vty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 8261a96a2..a447fbb35 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -946,7 +946,7 @@ static int ospf_vl_set_timers (struct ospf_vl_data *vl_data, struct ospf_vl_config_data *vl_config) { - struct interface *ifp = ifp = vl_data->vl_oi->ifp; + struct interface *ifp = vl_data->vl_oi->ifp; /* Virtual Link data initialised to defaults, so only set if a value given */ if (vl_config->hello_interval) |