ospf6: removing double-including of ospf6_neighbor.h

Moving ospf6_if_p2xp_neighcfg to ospf6_interface.h so we don't need to include ospf6_neighbor.h.
FRRouting · Oct 28, 2023 · 515250d · 515250d
1 parent 108adcd
commit 515250d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/ospf6d/ospf6_interface.h b/ospf6d/ospf6_interface.h
@@ -13,8 +13,6 @@
 
 DECLARE_MTYPE(OSPF6_AUTH_MANUAL_KEY);
 
-#include "ospf6_neighbor.h"
-
 /* Debug option */
 extern unsigned char conf_debug_ospf6_interface;
 #define OSPF6_DEBUG_INTERFACE_ON() (conf_debug_ospf6_interface = 1)
@@ -36,6 +34,25 @@ struct ospf6_auth_data {
 	uint32_t rx_drop; /* Pkt drop due to auth fail while reading */
 };
 
+PREDECL_RBTREE_UNIQ(ospf6_if_p2xp_neighcfgs);
+
+struct ospf6_if_p2xp_neighcfg {
+    struct ospf6_if_p2xp_neighcfgs_item item;
+
+    struct ospf6_interface *ospf6_if;
+    struct in6_addr addr;
+
+    bool cfg_cost : 1;
+
+    uint32_t cost;
+    uint16_t poll_interval;
+
+    /* NULL if down */
+    struct ospf6_neighbor *active;
+
+    struct event *t_unicast_hello;
+};
+
 /* Interface structure */
 struct ospf6_interface {
 	/* IF info from zebra */

diff --git a/ospf6d/ospf6_neighbor.h b/ospf6d/ospf6_neighbor.h
@@ -150,25 +150,6 @@ struct ospf6_neighbor {
 	bool lls_present;
 };
 
-PREDECL_RBTREE_UNIQ(ospf6_if_p2xp_neighcfgs);
-
-struct ospf6_if_p2xp_neighcfg {
-	struct ospf6_if_p2xp_neighcfgs_item item;
-
-	struct ospf6_interface *ospf6_if;
-	struct in6_addr addr;
-
-	bool cfg_cost : 1;
-
-	uint32_t cost;
-	uint16_t poll_interval;
-
-	/* NULL if down */
-	struct ospf6_neighbor *active;
-
-	struct event *t_unicast_hello;
-};
-
 /* Neighbor state */
 #define OSPF6_NEIGHBOR_DOWN     1
 #define OSPF6_NEIGHBOR_ATTEMPT  2