diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2021-11-11 09:39:52 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2021-11-11 09:39:52 -0500 |
| commit | 7a8ce9d56dec3844031563c3c55bed8eb3b692d5 (patch) | |
| tree | 540ad9555825587c56143bcfc1d1172e4977a00c /ldpd/init.c | |
| parent | 7347a4859d4b984cea0aef769a16622d3f02e44f (diff) | |
*: use compiler.h MIN/MAX macros instead of everyone having one
We had various forms of min/max macros across multiple daemons
all of which duplicated what we have in compiler.h. Convert
everyone to use the `correct` ones
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'ldpd/init.c')
| -rw-r--r-- | ldpd/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ldpd/init.c b/ldpd/init.c index d394fb08ea..0ee64c16fa 100644 --- a/ldpd/init.c +++ b/ldpd/init.c @@ -197,7 +197,7 @@ recv_init(struct nbr *nbr, char *buf, uint16_t len) len -= tlv_len; } - nbr->keepalive = min(nbr_get_keepalive(nbr->af, nbr->id), + nbr->keepalive = MIN(nbr_get_keepalive(nbr->af, nbr->id), ntohs(sess.keepalive_time)); max_pdu_len = ntohs(sess.max_pdu_len); @@ -208,7 +208,7 @@ recv_init(struct nbr *nbr, char *buf, uint16_t len) */ if (max_pdu_len <= 255) max_pdu_len = LDP_MAX_LEN; - nbr->max_pdu_len = min(max_pdu_len, LDP_MAX_LEN); + nbr->max_pdu_len = MIN(max_pdu_len, LDP_MAX_LEN); nbr_fsm(nbr, NBR_EVT_INIT_RCVD); |