[PATCH] iproute2: fix implicit declaration of function '__ALIGN_KERNEL'

[PATCH] iproute2: fix implicit declaration of function '__ALIGN_KERNEL'

[Gilles Espinasse]

Warning seen with 2.6.32 kernel headers
 m_xt.c:85: warning: implicit declaration of function '__ALIGN_KERNEL'

Declaration lines borrowed from iptables-1.4.11.1

Signed-off-by: Gilles Espinasse <g.esp@free.fr>
---
 include/linux/netfilter/x_tables.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 4120970..a6614b0 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -96,6 +96,8 @@ struct _xt_align {
 	__u64 u64;
 };
 
+#define __ALIGN_KERNEL(x, a)	__ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
+#define __ALIGN_KERNEL_MASK(x, mask)	(((x) + (mask)) & ~(mask))
 #define XT_ALIGN(s) __ALIGN_KERNEL((s), __alignof__(struct _xt_align))
 
 /* Standard return verdict, or do jump. */
-- 
1.5.6.5

Re: [PATCH] iproute2: fix implicit declaration of function '__ALIGN_KERNEL'

[Stephen Hemminger]

On Sun, 10 Jul 2011 17:46:20 +0200
Gilles Espinasse <g.esp@free.fr> wrote:

> Warning seen with 2.6.32 kernel headers
>  m_xt.c:85: warning: implicit declaration of function '__ALIGN_KERNEL'
> 
> Declaration lines borrowed from iptables-1.4.11.1
> 
> Signed-off-by: Gilles Espinasse <g.esp@free.fr>
> ---
>  include/linux/netfilter/x_tables.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
> index 4120970..a6614b0 100644
> --- a/include/linux/netfilter/x_tables.h
> +++ b/include/linux/netfilter/x_tables.h
> @@ -96,6 +96,8 @@ struct _xt_align {
>  	__u64 u64;
>  };
>  
> +#define __ALIGN_KERNEL(x, a)	__ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
> +#define __ALIGN_KERNEL_MASK(x, mask)	(((x) + (mask)) & ~(mask))
>  #define XT_ALIGN(s) __ALIGN_KERNEL((s), __alignof__(struct _xt_align))
>  
>  /* Standard return verdict, or do jump. */

This was a problem already fixed upstream by the iptables folks in later
version.  The files in include/linux are automatically generated by
a the kernel header script, and I don't want to start a bad precedent
by making a special case for this.