[B.A.T.M.A.N.] [PATCH] batman-adv: fix compat of net_ratelimited_function for >3.2.46

[B.A.T.M.A.N.] [PATCH] batman-adv: fix compat of net_ratelimited_function for >3.2.46

[Simon Wunderlich]

From: Simon Wunderlich <simon@open-mesh.com>

Appearently net_ratelimited_function was added to the stable series of
from 3.2.47, which results in a lot of warnings when compiling against
this kernel. This patch avoids this redefinition.

Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
---
 compat.h |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/compat.h b/compat.h
index 7e0a7f0..04a2256 100644
--- a/compat.h
+++ b/compat.h
@@ -241,11 +241,13 @@ static inline void batadv_eth_hw_addr_random(struct net_device *dev)
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0)
 
+#ifndef net_ratelimited_function
 #define net_ratelimited_function(func, ...) \
 	do { \
 		if (net_ratelimit()) \
 			func(__VA_ARGS__); \
 	} while (0)
+#endif /* ifndef net_ratelimited_function */
 
 #endif /* < KERNEL_VERSION(3, 5, 0) */
 
-- 
1.7.10.4

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: fix compat of net_ratelimited_function for >3.2.46

[Marek Lindner]

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

On Thursday 03 October 2013 23:02:13 Simon Wunderlich wrote:
> From: Simon Wunderlich <simon@open-mesh.com>
> 
> Appearently net_ratelimited_function was added to the stable series of
> from 3.2.47, which results in a lot of warnings when compiling against
> this kernel. This patch avoids this redefinition.
> 
> Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
> ---
>  compat.h |    2 ++
>  1 file changed, 2 insertions(+)

Applied in revision 227df84.

Thanks,
Marek

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

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: fix compat of net_ratelimited_function for >3.2.46

[Bastian Bittorf]

* Marek Lindner <mareklindner@neomailbox.ch> [09.10.2013 12:28]:
> > Appearently net_ratelimited_function was added to the stable series of
> > from 3.2.47, which results in a lot of warnings when compiling against
> > this kernel. This patch avoids this redefinition.
> > 
> > Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
> > ---
> >  compat.h |    2 ++
> >  1 file changed, 2 insertions(+)
> 
> Applied in revision 227df84.

can this be backported to 'openwrt-routing' feed?

bye, bastian

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: fix compat of net_ratelimited_function for >3.2.46

[Marek Lindner]

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

On Wednesday 09 October 2013 12:35:15 Bastian Bittorf wrote:
> * Marek Lindner <mareklindner@neomailbox.ch> [09.10.2013 12:28]:
> > > Appearently net_ratelimited_function was added to the stable series of
> > > from 3.2.47, which results in a lot of warnings when compiling against
> > > this kernel. This patch avoids this redefinition.
> > > 
> > > Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
> > > ---
> > > 
> > >  compat.h |    2 ++
> > >  1 file changed, 2 insertions(+)
> > 
> > Applied in revision 227df84.
> 
> can this be backported to 'openwrt-routing' feed?

Is it urgent ? This weekend we planned to release the next batman-adv version 
which includes this fix.

Cheers,
Marek

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