2011-12-02 11:12:49

by Felix Fietkau

Subject: [PATCH] compat: fix security_sk_clone dummy backport compile

linux/security.h needs to be included before the dummy function overrides it,
otherwise the macro that redirects it to the compat version will apply to
the kernel function as well, causing multiple conflicting definitions

Signed-off-by: Felix Fietkau <[email protected]>
---
include/linux/compat-3.1.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/compat-3.1.h b/include/linux/compat-3.1.h
index 0832183..5b00ac9 100644
--- a/include/linux/compat-3.1.h
+++ b/include/linux/compat-3.1.h
@@ -5,6 +5,8 @@

#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))

+#include <linux/security.h>
+
#define genl_dump_check_consistent(cb, user_hdr, family)

#define IFF_TX_SKB_SHARING 0x10000 /* The interface supports sharing
--
1.7.3.2

2011-12-02 14:52:01

by Luis R. Rodriguez

Subject: Re: [PATCH] compat: fix security_sk_clone dummy backport compile

On Fri, Dec 2, 2011 at 6:12 AM, Felix Fietkau <[email protected]> wrote:
> linux/security.h needs to be included before the dummy function overrides it,
> otherwise the macro that redirects it to the compat version will apply to
> the kernel function as well, causing multiple conflicting definitions
>
> Signed-off-by: Felix Fietkau <[email protected]>

Thanks, both patch applied and pushed!

Luis