Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 21:47:15 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

lib,pbrd: clean up style issues

Browse source 
Fix a couple of style warnings introduced by recent PR 14050.

Signed-off-by: Mark Stapp <mjs@labn.net>
This commit is contained in:
Mark Stapp 2023-07-25 11:09:29 -04:00
parent 3f043d027f
commit fe2bbcb01d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/zclient.c
View file

@ -1628,7 +1628,7 @@ stream_failure:
static void zapi_pbr_rule_filter_encode(struct stream *s, struct pbr_filter *f) static void zapi_pbr_rule_filter_encode(struct stream *s, struct pbr_filter *f)
{ {
assert(f->src_ip.family == f->dst_ip.family); assert(f->src_ip.family == f->dst_ip.family);
assert((AF_INET == f->src_ip.family) || (AF_INET6 == f->src_ip.family)); assert((f->src_ip.family == AF_INET) || (f->src_ip.family == AF_INET6));
stream_putl(s, f->filter_bm); stream_putl(s, f->filter_bm);
stream_putc(s, f->ip_proto); stream_putc(s, f->ip_proto);

8
pbrd/pbr_zebra.c
View file

@ -588,13 +588,13 @@ static bool pbr_encode_pbr_map_sequence(struct stream *s,
* can copy here instead of trying to infer from magic values. * can copy here instead of trying to infer from magic values.
*/ */
SET_FLAG(r.action.flags, PBR_ACTION_TABLE); /* always valid */ SET_FLAG(r.action.flags, PBR_ACTION_TABLE); /* always valid */
if (PBR_MAP_UNDEFINED_QUEUE_ID != pbrms->action_queue_id) if (pbrms->action_queue_id != PBR_MAP_UNDEFINED_QUEUE_ID)
SET_FLAG(r.action.flags, PBR_ACTION_QUEUE_ID); SET_FLAG(r.action.flags, PBR_ACTION_QUEUE_ID);
if (0 != pbrms->action_pcp) if (pbrms->action_pcp != 0)
SET_FLAG(r.action.flags, PBR_ACTION_PCP); SET_FLAG(r.action.flags, PBR_ACTION_PCP);
if (0 != pbrms->action_vlan_id) if (pbrms->action_vlan_id != 0)
SET_FLAG(r.action.flags, PBR_ACTION_VLAN_ID); SET_FLAG(r.action.flags, PBR_ACTION_VLAN_ID);
if (0 != pbrms->action_vlan_flags) if (pbrms->action_vlan_flags != 0)
SET_FLAG(r.action.flags, PBR_ACTION_VLAN_FLAGS); SET_FLAG(r.action.flags, PBR_ACTION_VLAN_FLAGS);
/* /*