From patchwork Wed Feb 22 19:37:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "James M. Leddy" X-Patchwork-Id: 142525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 510C4B6FB6 for ; Thu, 23 Feb 2012 06:37:49 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S0I0M-0007Ji-O7; Wed, 22 Feb 2012 19:37:34 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S0I0L-0007Jc-37 for kernel-team@lists.ubuntu.com; Wed, 22 Feb 2012 19:37:33 +0000 Received: from ool-43509a93.dyn.optonline.net ([67.80.154.147] helo=neptune) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1S0I0K-0005nV-St; Wed, 22 Feb 2012 19:37:33 +0000 From: "James M. Leddy" To: kernel-team@lists.ubuntu.com Subject: [Oneiric][SRU][PATCH v2 1/1] UBUNTU: Implement dummy security_sk_clone for compat-wireless Date: Wed, 22 Feb 2012 14:37:16 -0500 Message-Id: <1329939436-4467-2-git-send-email-james.leddy@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1329939436-4467-1-git-send-email-james.leddy@canonical.com> References: <4F3DA4B0.2080706@canonical.com> <1329939436-4467-1-git-send-email-james.leddy@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: "James M. Leddy" BugLink: https://bugs.launchpad.net/bugs/914689 From the upstream commit: This has been defined in include/linux/security.h for some time, but was only given an EXPORT_SYMBOL for 3.1. Add a compat_* definition to avoid breaking the module load with an undefined symbol. backport of compat : 545ece91974440f6447bbd27a44775bdaeee8212 0c51ea9ee6ad49b34dadf92798f7109f12cd0490 Signed-off-by: James M. Leddy --- updates/cw-3.1/include/linux/compat-3.1.h | 13 +++++++++++++ updates/cw-3.2/include/linux/compat-3.1.h | 13 +++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/updates/cw-3.1/include/linux/compat-3.1.h b/updates/cw-3.1/include/linux/compat-3.1.h index cff6521..492ec26 100644 --- a/updates/cw-3.1/include/linux/compat-3.1.h +++ b/updates/cw-3.1/include/linux/compat-3.1.h @@ -22,6 +22,8 @@ #define br_port_exists(dev) (dev->br_port) #endif +#include + #define genl_dump_check_consistent(cb, user_hdr, family) #define IFF_TX_SKB_SHARING 0x10000 /* The interface supports sharing @@ -36,6 +38,17 @@ .prod_id = { NULL, NULL, (v3), NULL }, \ .prod_id_hash = { 0, 0, (vh3), 0 }, } +/* + * This has been defined in include/linux/security.h for some time, but was + * only given an EXPORT_SYMBOL for 3.1. Add a compat_* definition to avoid + * breaking the compile. + */ +#define security_sk_clone(a, b) compat_security_sk_clone(a, b) + +static inline void security_sk_clone(const struct sock *sk, struct sock *newsk) +{ +} + #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) */ #endif /* LINUX_3_1_COMPAT_H */ diff --git a/updates/cw-3.2/include/linux/compat-3.1.h b/updates/cw-3.2/include/linux/compat-3.1.h index 93bb1f6..1b83318 100644 --- a/updates/cw-3.2/include/linux/compat-3.1.h +++ b/updates/cw-3.2/include/linux/compat-3.1.h @@ -5,6 +5,8 @@ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) +#include + #define genl_dump_check_consistent(cb, user_hdr, family) #define IFF_TX_SKB_SHARING 0x10000 /* The interface supports sharing @@ -19,6 +21,17 @@ .prod_id = { NULL, NULL, (v3), NULL }, \ .prod_id_hash = { 0, 0, (vh3), 0 }, } +/* + * This has been defined in include/linux/security.h for some time, but was + * only given an EXPORT_SYMBOL for 3.1. Add a compat_* definition to avoid + * breaking the compile. + */ +#define security_sk_clone(a, b) compat_security_sk_clone(a, b) + +static inline void security_sk_clone(const struct sock *sk, struct sock *newsk) +{ +} + #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) */ #endif /* LINUX_3_1_COMPAT_H */