From f978382d7803e3c132d0726b28a0e95a903e7181 Mon Sep 17 00:00:00 2001 From: anlan_cs Date: Wed, 15 Jun 2022 01:20:25 -0400 Subject: [PATCH 1/2] lib: correct two comments Signed-off-by: anlan_cs --- lib/if.c | 2 +- lib/stream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/if.c b/lib/if.c index 83fa85ecc1..89d30e4fb3 100644 --- a/lib/if.c +++ b/lib/if.c @@ -711,7 +711,7 @@ int if_is_broadcast(const struct interface *ifp) return ifp->flags & IFF_BROADCAST; } -/* Does this interface support broadcast ? */ +/* Does this interface support pointopoint ? */ int if_is_pointopoint(const struct interface *ifp) { return ifp->flags & IFF_POINTOPOINT; diff --git a/lib/stream.c b/lib/stream.c index c15baa0a2c..634ba6c5f9 100644 --- a/lib/stream.c +++ b/lib/stream.c @@ -691,7 +691,7 @@ double stream_getd(struct stream *s) return u.r; } -/* Copy to source to stream. +/* Copy from source to stream. * * XXX: This uses CHECK_SIZE and hence has funny semantics -> Size will wrap * around. This should be fixed once the stream updates are working. From e3f05a8a1aac5ba0e0bb32d6f81019e11c4ff250 Mon Sep 17 00:00:00 2001 From: anlan_cs Date: Wed, 15 Jun 2022 01:23:09 -0400 Subject: [PATCH 2/2] zebra: adjust one variable name Signed-off-by: anlan_cs --- zebra/zebra_evpn_mac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zebra/zebra_evpn_mac.c b/zebra/zebra_evpn_mac.c index 3bdd70e207..38a36cc7ae 100644 --- a/zebra/zebra_evpn_mac.c +++ b/zebra/zebra_evpn_mac.c @@ -324,7 +324,7 @@ void zebra_evpn_deref_ip2mac(struct zebra_evpn *zevpn, struct zebra_mac *mac) } static void zebra_evpn_mac_get_access_info(struct zebra_mac *mac, - struct interface **ifpP, + struct interface **p_ifp, vlanid_t *vid) { /* if the mac is associated with an ES we must get the access @@ -334,7 +334,7 @@ static void zebra_evpn_mac_get_access_info(struct zebra_mac *mac, struct zebra_if *zif; /* get the access port from the es */ - *ifpP = mac->es->zif ? mac->es->zif->ifp : NULL; + *p_ifp = mac->es->zif ? mac->es->zif->ifp : NULL; /* get the vlan from the EVPN */ if (mac->zevpn->vxlan_if) { zif = mac->zevpn->vxlan_if->info; @@ -347,8 +347,8 @@ static void zebra_evpn_mac_get_access_info(struct zebra_mac *mac, *vid = mac->fwd_info.local.vid; zns = zebra_ns_lookup(mac->fwd_info.local.ns_id); - *ifpP = if_lookup_by_index_per_ns(zns, - mac->fwd_info.local.ifindex); + *p_ifp = if_lookup_by_index_per_ns(zns, + mac->fwd_info.local.ifindex); } }