Merge pull request #5332 from mjstapp/remove_zapi_label_flag

[mirror_frr.git] / ospfd / ospf_sr.h

diff --git a/ospfd/ospf_sr.h b/ospfd/ospf_sr.h
index cb7d0833ec36346fd5604f1bef644c232aac7cc1..df923e970fa1ffc8a196bbc942cb0318ee2f9c25 100644 (file)
--- a/ospfd/ospf_sr.h
+++ b/ospfd/ospf_sr.h
@@ -27,9 +27,6 @@
 #ifndef _FRR_OSPF_SR_H
 #define _FRR_OSPF_SR_H
 
-/* Default Route priority for OSPF Segment Routing */
-#define OSPF_SR_PRIORITY_DEFAULT       10
-
 /* macros and constants for segment routing */
 #define SET_RANGE_SIZE_MASK             0xffffff00
 #define GET_RANGE_SIZE_MASK             0x00ffffff
@@ -49,11 +46,10 @@
 /* Segment Routing TLVs as per draft-ietf-ospf-segment-routing-extensions-19 */
 
 /* Segment ID could be a Label (3 bytes) or an Index (4 bytes) */
-#define SID_BASE_SIZE  4
 #define SID_LABEL      3
-#define SID_LABEL_SIZE (SID_BASE_SIZE + SID_LABEL)
+#define SID_LABEL_SIZE(U) (U - 1)
 #define SID_INDEX      4
-#define SID_INDEX_SIZE (SID_BASE_SIZE + SID_INDEX)
+#define SID_INDEX_SIZE(U) (U)
 
 /* SID/Label Sub TLV - section 2.1 */
 #define SUBTLV_SID_LABEL               1