diff options
| author | Rafael Zalamena <rzalamena@users.noreply.github.com> | 2018-02-19 17:23:49 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 17:23:49 -0300 |
| commit | 6ac12ea313530f6d4effa843b10f224cc3586fbd (patch) | |
| tree | fbfe86808da99fc16ce2b175a6b860ac36b6abfb | |
| parent | 97133f7f9f3c69addde1c9375d2229008e2e979f (diff) | |
| parent | 100cb793cce2ad3cad41e9b8c4d16b496dbf102b (diff) | |
Merge pull request #1765 from donaldsharp/sa_stuff
Sa stuff
| -rw-r--r-- | bgpd/bgp_evpn_vty.c | 4 | ||||
| -rw-r--r-- | isisd/isis_circuit.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index e1e11e44ac..1373afec4e 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -83,7 +83,7 @@ static void display_vrf_import_rt(struct vty *vty, case ECOMMUNITY_ENCODE_AS: eas.as = (*pnt++ << 8); eas.as |= (*pnt++); - pnt = ptr_get_be32(pnt, &eas.val); + ptr_get_be32(pnt, &eas.val); snprintf(rt_buf, RT_ADDRSTRLEN, "%u:%u", eas.as, eas.val); @@ -195,7 +195,7 @@ static void display_import_rt(struct vty *vty, struct irt_node *irt, case ECOMMUNITY_ENCODE_AS: eas.as = (*pnt++ << 8); eas.as |= (*pnt++); - pnt = ptr_get_be32(pnt, &eas.val); + ptr_get_be32(pnt, &eas.val); snprintf(rt_buf, RT_ADDRSTRLEN, "%u:%u", eas.as, eas.val); diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index 98087942a6..20ce0f1fad 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -1168,7 +1168,6 @@ void isis_circuit_af_set(struct isis_circuit *circuit, bool ip_router, struct isis_area *area = circuit->area; bool change = circuit->ip_router != ip_router || circuit->ipv6_router != ipv6_router; - bool was_enabled = !!circuit->area; area->ip_circuits += ip_router - circuit->ip_router; area->ipv6_circuits += ipv6_router - circuit->ipv6_router; @@ -1182,8 +1181,6 @@ void isis_circuit_af_set(struct isis_circuit *circuit, bool ip_router, if (!ip_router && !ipv6_router) isis_csm_state_change(ISIS_DISABLE, circuit, area); - else if (!was_enabled) - isis_csm_state_change(ISIS_ENABLE, circuit, area); else lsp_regenerate_schedule(circuit->area, circuit->is_type, 0); } |