From: Arend van Spriel <arend@broadcom.com>
To: "Luis R. Rodriguez" <mcgrof@kernel.org>
Cc: <backports@vger.kernel.org>, Arend van Spriel <arend@broadcom.com>
Subject: [PATCH 2/2] backport: add backport file for the next kernel release
Date: Fri, 30 Jan 2015 21:12:38 +0100 [thread overview]
Message-ID: <1422648758-31361-2-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1422648758-31361-1-git-send-email-arend@broadcom.com>
In mac80211-next a call to get_net_ns_by_fd() has been added in cfg80211
which resides in networking core. This function has been backported
such that it will always fail, ie. as it would when CONFIG_NET_NS
is not defined. The call was added by:
commit 4b681c82d2f9bef121c912ffcaac89a004af3f2c
Author: Vadim Kochan <vadim4j@gmail.com>
Date: Mon Jan 12 16:34:05 2015 +0200
nl80211: Allow set network namespace by fd
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
backport/compat/Makefile | 1 +
backport/compat/backport-3.20.c | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 backport/compat/backport-3.20.c
diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index 3d905ed..b6f1d12 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -25,6 +25,7 @@ compat-$(CPTCFG_KERNEL_3_15) += backport-3.15.o
compat-$(CPTCFG_KERNEL_3_17) += backport-3.17.o
compat-$(CPTCFG_KERNEL_3_18) += backport-3.18.o
compat-$(CPTCFG_KERNEL_3_19) += backport-3.19.o
+compat-$(CPTCFG_KERNEL_3_20) += backport-3.20.o
compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
compat-$(CPTCFG_BPAUTO_BUILD_DMA_SHARED_HELPERS) += dma-shared-helpers.o
diff --git a/backport/compat/backport-3.20.c b/backport/compat/backport-3.20.c
new file mode 100644
index 0000000..ce119fd
--- /dev/null
+++ b/backport/compat/backport-3.20.c
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2014 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * Backport functionality introduced in Linux 3.19.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/export.h>
+#include <linux/net.h>
+
+struct net *get_net_ns_by_fd(int fd)
+{
+ return ERR_PTR(-EINVAL);
+}
+EXPORT_SYMBOL_GPL(get_net_ns_by_fd);
--
1.9.1
next prev parent reply other threads:[~2015-01-30 20:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-30 20:12 [PATCH 1/2] backport: small copy&paste error fixed Arend van Spriel
2015-01-30 20:12 ` Arend van Spriel [this message]
2015-01-30 20:21 ` [PATCH 2/2] backport: add backport file for the next kernel release Johannes Berg
2015-01-30 20:28 ` Arend van Spriel
2015-02-22 2:06 ` [PATCH 1/2] backport: small copy&paste error fixed Hauke Mehrtens
2015-02-22 7:36 ` Arend van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422648758-31361-2-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=backports@vger.kernel.org \
--cc=mcgrof@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox