Merge pull request #11419 from anlancs/fix/minor-1

zebra, lib: minor changes
This commit is contained in:
Donald Sharp 2022-06-16 16:35:38 -04:00 committed by GitHub
commit 8dfcf20fa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -711,7 +711,7 @@ int if_is_broadcast(const struct interface *ifp)
return ifp->flags & IFF_BROADCAST; return ifp->flags & IFF_BROADCAST;
} }
/* Does this interface support broadcast ? */ /* Does this interface support pointopoint ? */
int if_is_pointopoint(const struct interface *ifp) int if_is_pointopoint(const struct interface *ifp)
{ {
return ifp->flags & IFF_POINTOPOINT; return ifp->flags & IFF_POINTOPOINT;

View File

@ -690,7 +690,7 @@ double stream_getd(struct stream *s)
return u.r; 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 * XXX: This uses CHECK_SIZE and hence has funny semantics -> Size will wrap
* around. This should be fixed once the stream updates are working. * around. This should be fixed once the stream updates are working.

View File

@ -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, static void zebra_evpn_mac_get_access_info(struct zebra_mac *mac,
struct interface **ifpP, struct interface **p_ifp,
vlanid_t *vid) vlanid_t *vid)
{ {
/* if the mac is associated with an ES we must get the access /* 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; struct zebra_if *zif;
/* get the access port from the es */ /* 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 */ /* get the vlan from the EVPN */
if (mac->zevpn->vxlan_if) { if (mac->zevpn->vxlan_if) {
zif = mac->zevpn->vxlan_if->info; 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; *vid = mac->fwd_info.local.vid;
zns = zebra_ns_lookup(mac->fwd_info.local.ns_id); zns = zebra_ns_lookup(mac->fwd_info.local.ns_id);
*ifpP = if_lookup_by_index_per_ns(zns, *p_ifp = if_lookup_by_index_per_ns(zns,
mac->fwd_info.local.ifindex); mac->fwd_info.local.ifindex);
} }
} }