summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ospf6d/ospf6_interface.c2
-rw-r--r--ospf6d/ospf6_message.c2
-rw-r--r--ospf6d/ospf6_network.c2
-rw-r--r--ospf6d/ospf6_network.h1
-rw-r--r--ospf6d/ospf6d.c2
5 files changed, 4 insertions, 5 deletions
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index fabcc426ea..334f1bd2a5 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -31,10 +31,10 @@
#include "ospf6_lsa.h"
#include "ospf6_lsdb.h"
+#include "ospf6_top.h"
#include "ospf6_network.h"
#include "ospf6_message.h"
#include "ospf6_route.h"
-#include "ospf6_top.h"
#include "ospf6_area.h"
#include "ospf6_interface.h"
#include "ospf6_neighbor.h"
diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index eb8c414d9b..02daaf6c2c 100644
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -31,10 +31,10 @@
#include "ospf6_proto.h"
#include "ospf6_lsa.h"
#include "ospf6_lsdb.h"
+#include "ospf6_top.h"
#include "ospf6_network.h"
#include "ospf6_message.h"
-#include "ospf6_top.h"
#include "ospf6_area.h"
#include "ospf6_neighbor.h"
#include "ospf6_interface.h"
diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c
index abbb180d45..6c83881bf4 100644
--- a/ospf6d/ospf6_network.c
+++ b/ospf6d/ospf6_network.c
@@ -30,9 +30,9 @@
#include "libospf.h"
#include "ospf6_proto.h"
+#include "ospf6_top.h"
#include "ospf6_network.h"
#include "ospf6d.h"
-#include "ospf6_top.h"
struct in6_addr allspfrouters6;
struct in6_addr alldrouters6;
diff --git a/ospf6d/ospf6_network.h b/ospf6d/ospf6_network.h
index eeef0514f3..d11a611c49 100644
--- a/ospf6d/ospf6_network.h
+++ b/ospf6d/ospf6_network.h
@@ -21,7 +21,6 @@
#ifndef OSPF6_NETWORK_H
#define OSPF6_NETWORK_H
-struct ospf6 *ospf6;
extern struct in6_addr allspfrouters6;
extern struct in6_addr alldrouters6;
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index e904482391..65607fc131 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -27,6 +27,7 @@
#include "plist.h"
#include "ospf6_proto.h"
+#include "ospf6_top.h"
#include "ospf6_network.h"
#include "ospf6_lsa.h"
#include "ospf6_lsdb.h"
@@ -34,7 +35,6 @@
#include "ospf6_route.h"
#include "ospf6_zebra.h"
#include "ospf6_spf.h"
-#include "ospf6_top.h"
#include "ospf6_area.h"
#include "ospf6_interface.h"
#include "ospf6_neighbor.h"