Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling in master 2 #16605

Merged
merged 3 commits into from
Aug 19, 2024
Merged

Spelling in master 2 #16605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82bbf2e
*: Spelling issues
donaldsharp Aug 18, 2024
38b9df8
zebra: Do not assign time and then never use it
donaldsharp Aug 18, 2024
8432331
bgpd: Actually ensure the hash works
donaldsharp Aug 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bgpd/bgp_attr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ static uint32_t evpn_overlay_hash_key_make(const void *p)
array_size(bre->gw_ip.ipaddr_v6.s6_addr32), 0);

key = jhash_1word(bre->type, key);
key = jhash(bre->eth_s_id.val, sizeof(bre->eth_s_id.val), 0);
key = jhash(bre->eth_s_id.val, sizeof(bre->eth_s_id.val), key);
return key;
}

Expand Down
10 changes: 4 additions & 6 deletions bgpd/bgp_route.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,18 +1607,16 @@ int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
if (ret == 1) {
*reason = bgp_path_selection_neighbor_ip;
if (debug)
zlog_debug(
"%s: %s loses to %s due to Neighor IP comparison",
pfx_buf, new_buf, exist_buf);
zlog_debug("%s: %s loses to %s due to Neighbor IP comparison",
pfx_buf, new_buf, exist_buf);
return 0;
}

if (ret == -1) {
*reason = bgp_path_selection_neighbor_ip;
if (debug)
zlog_debug(
"%s: %s wins over %s due to Neighor IP comparison",
pfx_buf, new_buf, exist_buf);
zlog_debug("%s: %s wins over %s due to Neighbor IP comparison",
pfx_buf, new_buf, exist_buf);
return 1;
}

Expand Down
5 changes: 2 additions & 3 deletions ospfd/ospf_asbr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,9 +1078,8 @@ static void ospf_external_aggr_timer(struct ospf *ospf,
if (ospf->aggr_action == OSPF_ROUTE_AGGR_ADD) {

if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
zlog_debug(
"%s: Not required to retsart timer,set is already added.",
__func__);
zlog_debug("%s: Not required to restart timer,set is already added.",
__func__);
return;
}

Expand Down
2 changes: 1 addition & 1 deletion yang/ietf/ietf-bgp-types.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ module ietf-bgp-types {
// TODO: needs more work to make this more precise given the
// variability of extended community attribute specifications
// 8-octet value:
// <type> 2 octects
// <type> 2 octets
// <value> 6 octets

type union {
Expand Down
2 changes: 1 addition & 1 deletion zebra/zebra_gr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ static int32_t zebra_gr_delete_stale_route(struct client_gr_info *info,
uint16_t instance;
struct zserv *s_client;
struct zserv *client;
time_t restart_time = time(NULL);
time_t restart_time;

if ((info == NULL) || (zvrf == NULL))
return -1;
Expand Down
Loading