proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 08:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Fixup oil_if_has and oil_if_set to be consistent

Browse Source 
the v4 and v6 versions were different.  Make them the same.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-06-09 07:06:30 -04:00
parent b2e37a56f6
commit aa0bb312b1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pimd/pim_oil.c
View File

@ -255,7 +255,7 @@ int pim_channel_del_oif(struct channel_oil *channel_oil, struct interface *oif,
return 0;
}
oil_if_set(channel_oil, pim_ifp->mroute_vif_index, false);
oil_if_set(channel_oil, pim_ifp->mroute_vif_index, 0);
/* clear mute; will be re-evaluated when the OIF becomes valid again */
channel_oil->oif_flags[pim_ifp->mroute_vif_index] &= ~PIM_OIF_FLAG_MUTE;

7
pimd/pim_oil.h
View File

@ -130,9 +130,9 @@ static inline vifi_t *oil_parent(struct channel_oil *c_oil)
return &c_oil->oil.mfcc_parent;
}
static inline uint8_t oil_if_has(struct channel_oil *c_oil, vifi_t ifi)
static inline bool oil_if_has(struct channel_oil *c_oil, vifi_t ifi)
{
return c_oil->oil.mfcc_ttls[ifi];
return !!c_oil->oil.mfcc_ttls[ifi];
}
static inline void oil_if_set(struct channel_oil *c_oil, vifi_t ifi, uint8_t set)
@ -166,7 +166,8 @@ static inline bool oil_if_has(struct channel_oil *c_oil, mifi_t ifi)
return !!IF_ISSET(ifi, &c_oil->oil.mf6cc_ifset);
}
static inline void oil_if_set(struct channel_oil *c_oil, mifi_t ifi, bool set)
static inline void oil_if_set(struct channel_oil *c_oil, mifi_t ifi,
uint8_t set)
{
if (set)
IF_SET(ifi, &c_oil->oil.mf6cc_ifset);