Merge pull request #8242 from opensourcerouting/format-warning-fix

[mirror_frr.git] / ldpd / ldp.h

diff --git a/ldpd/ldp.h b/ldpd/ldp.h
index c2b64d20c67458cb9f413df9157ecfcb1edc62a4..4bad3afc3c87c12db767450f32b8d15e81bbc556 100644 (file)
--- a/ldpd/ldp.h
+++ b/ldpd/ldp.h
@@ -51,6 +51,8 @@
 #define        INIT_DELAY_TMR          15
 #define        MAX_DELAY_TMR           120
 
+#define        DFLT_WAIT_FOR_SYNC      10
+
 #define        MIN_PWID_ID             1
 #define        MAX_PWID_ID             0xffffffff
 
@@ -285,9 +287,6 @@ struct address_list_tlv {
 #define        MAP_TYPE_GENPWID        0x81
 
 #define CONTROL_WORD_FLAG      0x8000
-#define PW_TYPE_ETHERNET_TAGGED        0x0004
-#define PW_TYPE_ETHERNET       0x0005
-#define PW_TYPE_WILDCARD       0x7FFF
 #define DEFAULT_PW_TYPE                PW_TYPE_ETHERNET
 
 #define PW_TWCARD_RESERVED_BIT 0x8000
@@ -329,13 +328,6 @@ struct pw_status_tlv {
 #define PW_STATUS_TLV_SIZE     8
 #define PW_STATUS_TLV_LEN      4
 
-#define PW_FORWARDING          0
-#define PW_NOT_FORWARDING      (1 << 0)
-#define PW_LOCAL_RX_FAULT      (1 << 1)
-#define PW_LOCAL_TX_FAULT      (1 << 2)
-#define PW_PSN_RX_FAULT                (1 << 3)
-#define PW_PSN_TX_FAULT                (1 << 4)
-
 #define        NO_LABEL                UINT32_MAX
 
 #endif /* !_LDP_H_ */