[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: remove useless forward declarations

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: remove useless forward declarations

[Antonio Quartulli]

If main.h is included, the batman-adv private forward declarations are
not needed anymore. Remove them.

Cc: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
---
 net/batman-adv/gateway_client.h | 1 -
 net/batman-adv/icmp_socket.h    | 2 --
 2 files changed, 3 deletions(-)

diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h
index 582dd8c..c74aca5 100644
--- a/net/batman-adv/gateway_client.h
+++ b/net/batman-adv/gateway_client.h
@@ -22,7 +22,6 @@
 
 #include <linux/types.h>
 
-struct batadv_tvlv_gateway_data;
 struct seq_file;
 struct sk_buff;
 
diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h
index 618d5de..ce3ed25 100644
--- a/net/batman-adv/icmp_socket.h
+++ b/net/batman-adv/icmp_socket.h
@@ -22,8 +22,6 @@
 
 #include <linux/types.h>
 
-struct batadv_icmp_header;
-
 #define BATADV_ICMP_SOCKET "socket"
 
 void batadv_socket_init(void);
-- 
2.8.3

[B.A.T.M.A.N.] [PATCH 2/2] batman-adv: move include line at the same place as other files

[Antonio Quartulli]

main.h is always included after the #ifdef guard except for
bat_v_elp.h. Move it at the right place.

Cc: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
---
 net/batman-adv/bat_v_elp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h
index cc130b2..be17c0b 100644
--- a/net/batman-adv/bat_v_elp.h
+++ b/net/batman-adv/bat_v_elp.h
@@ -15,11 +15,11 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "main.h"
-
 #ifndef _NET_BATMAN_ADV_BAT_V_ELP_H_
 #define _NET_BATMAN_ADV_BAT_V_ELP_H_
 
+#include "main.h"
+
 struct sk_buff;
 struct work_struct;
 
-- 
2.8.3

Re: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: remove useless forward declarations

[Sven Eckelmann]

[-- Attachment #1: Type: text/plain, Size: 1037 bytes --]

On Saturday 21 May 2016 20:17:55 Antonio Quartulli wrote:
> If main.h is included, the batman-adv private forward declarations are
> not needed anymore. Remove them.

No, these are defined in packet.h and not main.h/types.h

Kind regards,
	Sven

>  net/batman-adv/gateway_client.h | 1 -
>  net/batman-adv/icmp_socket.h    | 2 --
>  2 files changed, 3 deletions(-)
> 
> diff --git a/net/batman-adv/gateway_client.h
> b/net/batman-adv/gateway_client.h index 582dd8c..c74aca5 100644
> --- a/net/batman-adv/gateway_client.h
> +++ b/net/batman-adv/gateway_client.h
> @@ -22,7 +22,6 @@
> 
>  #include <linux/types.h>
> 
> -struct batadv_tvlv_gateway_data;
>  struct seq_file;
>  struct sk_buff;
> 
> diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h
> index 618d5de..ce3ed25 100644
> --- a/net/batman-adv/icmp_socket.h
> +++ b/net/batman-adv/icmp_socket.h
> @@ -22,8 +22,6 @@
> 
>  #include <linux/types.h>
> 
> -struct batadv_icmp_header;
> -
>  #define BATADV_ICMP_SOCKET "socket"
> 
>  void batadv_socket_init(void);

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: move include line at the same place as other files

[Sven Eckelmann]

[-- Attachment #1: Type: text/plain, Size: 899 bytes --]

On Saturday 21 May 2016 20:17:56 Antonio Quartulli wrote:
> main.h is always included after the #ifdef guard except for
> bat_v_elp.h. Move it at the right place.
> 
> Cc: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Antonio Quartulli <a@unstable.cc>
> ---

Good find :)

Reviewed-by: Sven Eckelmann <sven@narfation.org>

Kind regards,
	Sven

>  net/batman-adv/bat_v_elp.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h
> index cc130b2..be17c0b 100644
> --- a/net/batman-adv/bat_v_elp.h
> +++ b/net/batman-adv/bat_v_elp.h
> @@ -15,11 +15,11 @@
>   * along with this program; if not, see <http://www.gnu.org/licenses/>.
>   */
> 
> -#include "main.h"
> -
>  #ifndef _NET_BATMAN_ADV_BAT_V_ELP_H_
>  #define _NET_BATMAN_ADV_BAT_V_ELP_H_
> 
> +#include "main.h"
> +
>  struct sk_buff;
>  struct work_struct;

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: remove useless forward declarations

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 392 bytes --]

On Sat, May 21, 2016 at 02:30:01PM +0200, Sven Eckelmann wrote:
> On Saturday 21 May 2016 20:17:55 Antonio Quartulli wrote:
> > If main.h is included, the batman-adv private forward declarations are
> > not needed anymore. Remove them.
> 
> No, these are defined in packet.h and not main.h/types.h

Right. This single patch can be dropped then.

Cheers,


-- 
Antonio Quartulli

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: remove useless forward declarations

[Marek Lindner]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

On Saturday, May 21, 2016 20:17:55 Antonio Quartulli wrote:
> If main.h is included, the batman-adv private forward declarations are
> not needed anymore. Remove them.
> 
> Cc: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Antonio Quartulli <a@unstable.cc>
> ---
>  net/batman-adv/gateway_client.h | 1 -
>  net/batman-adv/icmp_socket.h    | 2 --
>  2 files changed, 3 deletions(-)

Applied in revision 563823d.

Thanks,
Marek

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: move include line at the same place as other files

[Marek Lindner]

[-- Attachment #1: Type: text/plain, Size: 497 bytes --]

On Saturday, May 21, 2016 14:32:38 Sven Eckelmann wrote:
> Signed by sven@narfation.org.	Show Details
> 
> On Saturday 21 May 2016 20:17:56 Antonio Quartulli wrote:
> > main.h is always included after the #ifdef guard except for
> > bat_v_elp.h. Move it at the right place.
> >
> > Cc: Sven Eckelmann <sven@narfation.org>
> > Signed-off-by: Antonio Quartulli <a@unstable.cc>
> > ---
> 
> Good find
> 
> Reviewed-by: Sven Eckelmann <sven@narfation.org>

Applied in revision f47544c.

Thanks,
Marek

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 473 bytes --]