proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 13:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Explicitly call out the correct queue name

Browse Source 
There were more than a few places where the NHG meta
queue was not being explicitly called out.  Let's
be consistent and use the same nomenclature as much
as possible when talking about metaQ's.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-08-09 09:22:43 -04:00
parent 9ad7e387be
commit 4bbbd1f6b3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zebra/zebra_rib.c
View File

@ -119,7 +119,8 @@ static const struct {
/* no entry/default: 150 */ /* no entry/default: 150 */
}; };
/* EVPN/VXLAN subqueue is number 1 */ /* Meta Q's specific names */
#define META_QUEUE_NHG 0
#define META_QUEUE_EVPN 1 #define META_QUEUE_EVPN 1
/* Wrapper struct for nhg workqueue items; a 'ctx' is an incoming update /* Wrapper struct for nhg workqueue items; a 'ctx' is an incoming update
@ -167,9 +168,9 @@ struct wq_evpn_wrapper {
static const char *subqueue2str(uint8_t index) static const char *subqueue2str(uint8_t index)
{ {
switch (index) { switch (index) {
case 0: case META_QUEUE_NHG:
return "NHG Objects"; return "NHG Objects";
case 1: case META_QUEUE_EVPN:
return "EVPN/VxLan Objects"; return "EVPN/VxLan Objects";
case 2: case 2:
return "Connected Routes"; return "Connected Routes";
@ -2407,7 +2408,7 @@ static void process_subq_nhg(struct listnode *lnode)
struct nhg_ctx *ctx; struct nhg_ctx *ctx;
struct nhg_hash_entry *nhe, *newnhe; struct nhg_hash_entry *nhe, *newnhe;
struct wq_nhg_wrapper *w; struct wq_nhg_wrapper *w;
uint8_t qindex = route_info[ZEBRA_ROUTE_NHG].meta_q_map; uint8_t qindex = META_QUEUE_NHG;
w = listgetdata(lnode); w = listgetdata(lnode);
@ -2505,7 +2506,7 @@ static unsigned int process_subq(struct list *subq, uint8_t qindex)
if (qindex == META_QUEUE_EVPN) if (qindex == META_QUEUE_EVPN)
process_subq_evpn(lnode); process_subq_evpn(lnode);
else if (qindex == route_info[ZEBRA_ROUTE_NHG].meta_q_map) else if (qindex == META_QUEUE_NHG)
process_subq_nhg(lnode); process_subq_nhg(lnode);
else else
process_subq_route(lnode, qindex); process_subq_route(lnode, qindex);
@ -2613,7 +2614,7 @@ static int rib_meta_queue_add(struct meta_queue *mq, void *data)
static int rib_meta_queue_nhg_ctx_add(struct meta_queue *mq, void *data) static int rib_meta_queue_nhg_ctx_add(struct meta_queue *mq, void *data)
{ {
struct nhg_ctx *ctx = NULL; struct nhg_ctx *ctx = NULL;
uint8_t qindex = route_info[ZEBRA_ROUTE_NHG].meta_q_map; uint8_t qindex = META_QUEUE_NHG;
struct wq_nhg_wrapper *w; struct wq_nhg_wrapper *w;
ctx = (struct nhg_ctx *)data; ctx = (struct nhg_ctx *)data;
@ -2639,7 +2640,7 @@ static int rib_meta_queue_nhg_ctx_add(struct meta_queue *mq, void *data)
static int rib_meta_queue_nhg_add(struct meta_queue *mq, void *data) static int rib_meta_queue_nhg_add(struct meta_queue *mq, void *data)
{ {
struct nhg_hash_entry *nhe = NULL; struct nhg_hash_entry *nhe = NULL;
uint8_t qindex = route_info[ZEBRA_ROUTE_NHG].meta_q_map; uint8_t qindex = META_QUEUE_NHG;
struct wq_nhg_wrapper *w; struct wq_nhg_wrapper *w;
nhe = (struct nhg_hash_entry *)data; nhe = (struct nhg_hash_entry *)data;
@ -2996,7 +2997,7 @@ void meta_queue_free(struct meta_queue *mq)
for (i = 0; i < MQ_SIZE; i++) { for (i = 0; i < MQ_SIZE; i++) {
/* Some subqueues may need cleanup - nhgs for example */ /* Some subqueues may need cleanup - nhgs for example */
if (i == route_info[ZEBRA_ROUTE_NHG].meta_q_map) if (i == META_QUEUE_NHG)
nhg_meta_queue_free(mq->subq[i]); nhg_meta_queue_free(mq->subq[i]);
else if (i == META_QUEUE_EVPN) else if (i == META_QUEUE_EVPN)
evpn_meta_queue_free(mq->subq[i]); evpn_meta_queue_free(mq->subq[i]);
@ -3027,8 +3028,7 @@ void rib_meta_queue_free_vrf(struct meta_queue *mq, struct zebra_vrf *zvrf)
XFREE(MTYPE_WQ_WRAPPER, w); XFREE(MTYPE_WQ_WRAPPER, w);
del = true; del = true;
} }
} else if (i == } else if (i == META_QUEUE_NHG) {
route_info[ZEBRA_ROUTE_NHG].meta_q_map) {
struct wq_nhg_wrapper *w = data; struct wq_nhg_wrapper *w = data;
if (w->type == WQ_NHG_WRAPPER_TYPE_CTX && if (w->type == WQ_NHG_WRAPPER_TYPE_CTX &&