diff mbox

batman-adv: move misplaced compat code

Message ID 1413741581-20407-1-git-send-email-antonio@meshcoding.com (mailing list archive)
State Accepted, archived
Commit b609f2633565303738d115561983dc3567d25ab6
Headers

Commit Message

Antonio Quartulli Oct. 19, 2014, 5:59 p.m. UTC 
  consume_skb() has to be re-defined only for kernels <2.6.30
but the macro was accidentally placed right above any #ifdef
block causing the function to be always redefined.

Fix this by moving the macro to the proper #ifdef block.

Introduced by: 15fb0fab51a3695738f65dfaab045e979fc89dce
("batman-adv add compat code for consume_skb")

Reported-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
 compat.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Marek Lindner Dec. 29, 2014, 3:55 a.m. UTC | #1 
On Sunday 19 October 2014 19:59:41 Antonio Quartulli wrote:
> consume_skb() has to be re-defined only for kernels <2.6.30
> but the macro was accidentally placed right above any #ifdef
> block causing the function to be always redefined.
> 
> Fix this by moving the macro to the proper #ifdef block.
> 
> Introduced by: 15fb0fab51a3695738f65dfaab045e979fc89dce
> ("batman-adv add compat code for consume_skb")
> 
> Reported-by: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
> ---
>  compat.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied in revision b609f26.

Thanks,
Marek
diff mbox

Patch

diff --git a/compat.h b/compat.h
index ed5b815..8de2010 100644
--- a/compat.h
+++ b/compat.h
@@ -23,10 +23,10 @@ 
 
 #include <linux/version.h>	/* LINUX_VERSION_CODE */
 
-#define consume_skb(_skb) kfree_skb(_skb)
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
 
+#define consume_skb(_skb) kfree_skb(_skb)
+
 #undef __alloc_percpu
 #define __alloc_percpu(size, align) \
 	percpu_alloc_mask((size), GFP_KERNEL, cpu_possible_map)