diff options
| author | Lou Berger <lberger@labn.net> | 2017-01-26 09:59:03 -0500 |
|---|---|---|
| committer | Lou Berger <lberger@labn.net> | 2017-01-26 09:59:03 -0500 |
| commit | 1c404af8b58696b70313c728a39edc2983ed9827 (patch) | |
| tree | 8241673a4870cb2b5a8d1262d3a793113ab60e64 /lib/zclient.c | |
| parent | 4f280b15b1049b42241e9c0ac7d2e4fa0c8e3b22 (diff) | |
| parent | 1e78204400361625235b3e7ea5d2c570b16d7c55 (diff) | |
Merge branch 'master' into working/master/patch-set/4-misc-fixes
Merged pull request with master
Conflicts:
bgpd/bgp_mplsvpn.c
bgpd/bgp_route.c
bgpd/rfapi/rfapi_vty.c
Diffstat (limited to 'lib/zclient.c')
| -rw-r--r-- | lib/zclient.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/zclient.c b/lib/zclient.c index a4c5fa4afb..42fa41c9c8 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -1626,6 +1626,7 @@ zclient_read (struct thread *thread) case ZEBRA_REDISTRIBUTE_IPV6_DEL: if (zclient->redistribute_route_ipv6_del) (*zclient->redistribute_route_ipv6_del) (command, zclient, length, vrf_id); + break; case ZEBRA_INTERFACE_LINK_PARAMS: if (zclient->interface_link_params) (*zclient->interface_link_params) (command, zclient, length); |