On Wednesday 11 May 2016 18:29:16 Antonio Quartulli wrote: > If main.h is included, the forward declaration for struct batadv_priv > is not required. > > Cc: Sven Eckelmann <s...@narfation.org> > Signed-off-by: Antonio Quartulli <a...@unstable.cc> > --- > > Sven, is there any special region for not having the include in this file ? > It seems to be compiling just fine. > > Cheers,
We have some files which don't include main.h:
* net/batman-adv/bat_algo.h
* net/batman-adv/bat_v_ogm.h
* net/batman-adv/netlink.h
There is a special exception which should not include it to avoid cycles in
the includes:
* net/batman-adv/packet.h
The reason for the other three is just... there is no reason I can provide
other than it was not necessary for these files :). But if you want that to
have "main.h" included everywhere then please do it really everywhere:
diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h
index 03dafd3..b727762 100644
--- a/net/batman-adv/bat_algo.h
+++ b/net/batman-adv/bat_algo.h
@@ -18,7 +18,7 @@
#ifndef _NET_BATMAN_ADV_BAT_ALGO_H_
#define _NET_BATMAN_ADV_BAT_ALGO_H_
-struct batadv_priv;
+#include "main.h"
int batadv_iv_init(void);
diff --git a/net/batman-adv/bat_v_ogm.h b/net/batman-adv/bat_v_ogm.h
index d849c75..4c4d45c 100644
--- a/net/batman-adv/bat_v_ogm.h
+++ b/net/batman-adv/bat_v_ogm.h
@@ -18,10 +18,10 @@
#ifndef _BATMAN_ADV_BATADV_V_OGM_H_
#define _BATMAN_ADV_BATADV_V_OGM_H_
+#include "main.h"
+
#include <linux/types.h>
-struct batadv_hard_iface;
-struct batadv_priv;
struct sk_buff;
int batadv_v_ogm_init(struct batadv_priv *bat_priv);
diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h
index fa152a8..39044cc 100644
--- a/net/batman-adv/netlink.h
+++ b/net/batman-adv/netlink.h
@@ -18,6 +18,8 @@
#ifndef _NET_BATMAN_ADV_NETLINK_H_
#define _NET_BATMAN_ADV_NETLINK_H_
+#include "main.h"
+
void batadv_netlink_register(void);
void batadv_netlink_unregister(void);
Kind regards,
Sven
signature.asc
Description: This is a digitally signed message part.
