[PATCH 01/13] backports: cw1200 needs get_random_int() exported

[PATCH 01/13] backports: cw1200 needs get_random_int() exported

[Hauke Mehrtens]

get_random_int() does not get exported in kernel < 3.10 and cw1200
needs it.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Solomon Peachy <pizza@shaftnet.org>
---
 dependencies |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/dependencies b/dependencies
index f1e514b..1ad08ac 100644
--- a/dependencies
+++ b/dependencies
@@ -45,6 +45,8 @@ WL1251 3.0
 
 MWIFIEX 2.6.27
 
+CW1200 3.10
+
 # DRM stuff
 HDMI 3.2
 DRM 3.2
-- 
1.7.10.4

[PATCH 02/13] backports: fix conditional include of arch_phys_wc_add()

[Hauke Mehrtens]

This fixes a problem introduced in this commit:
commit c871780b5afa182878884bf5ccd8df4817a2660f
Author: Arik Nemtsov <arik@wizery.com>
Date:   Wed Aug 14 10:48:05 2013 +0300

    backports: rename some mem functions to not break custom kernels

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Arik Nemtsov <arik@wizery.com>
---
 backport/backport-include/linux/io.h |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backport/backport-include/linux/io.h b/backport/backport-include/linux/io.h
index 5447df8..84a8c21 100644
--- a/backport/backport-include/linux/io.h
+++ b/backport/backport-include/linux/io.h
@@ -13,10 +13,11 @@
  * arch_phys_del_wc(0) or arch_phys_del_wc(any error code) is guaranteed
  * to have no effect.
  */
+#ifndef arch_phys_wc_add
+
 #define arch_phys_wc_add LINUX_BACKPORT(arch_phys_wc_add)
 #define arch_phys_wc_del LINUX_BACKPORT(arch_phys_wc_del)
 
-#ifndef arch_phys_wc_add
 #ifdef CONFIG_MTRR
 extern int __must_check arch_phys_wc_add(unsigned long base,
 					 unsigned long size);
@@ -32,8 +33,6 @@ static inline void arch_phys_wc_del(int handle)
 {
 }
 #endif /* CONFIG_MTRR */
-
-#define arch_phys_wc_add arch_phys_wc_add
 #endif
 
 #endif /* __BACKPORT_LINUX_IO_H */
-- 
1.7.10.4

[PATCH 03/13] backports: usb_translate_errors() is needed for < 3.2

[Hauke Mehrtens]

usb_translate_errors() is needed for every kernel < 3.2 and not <
2.6.39.

This fixes a problem introduced in this commit:
commit aee2dc1d7fd03d3900e06e88793b519e21049de0
Author: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date:   Thu Aug 15 14:40:20 2013 +0200

    backports: add usb_translate_errors()

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Patrick Ziegler <patrick.ziegler@fh-kl.de>
---
 backport/backport-include/linux/usb.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backport/backport-include/linux/usb.h b/backport/backport-include/linux/usb.h
index a717b7a..70d89b8 100644
--- a/backport/backport-include/linux/usb.h
+++ b/backport/backport-include/linux/usb.h
@@ -145,7 +145,7 @@ extern void usb_unpoison_urb(struct urb *urb);
 extern int usb_anchor_empty(struct usb_anchor *anchor);
 #endif /* 2.6.23-2.6.27 */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
 static inline int usb_translate_errors(int error_code)
 {
 	switch (error_code) {
-- 
1.7.10.4

[PATCH 04/13] backports: add missing include for is_valid_ether_addr()

[Hauke Mehrtens]

is_valid_ether_addr() is used, but the header here it is declared was
not included.

This fixes a problem introduced in commit:
commit 521acfd92f168fc9b8b6a1cefe9a165243f3d872
Author: Patrick Ziegler <patrick.ziegler@fh-kl.de>
Date:   Thu Aug 15 14:40:09 2013 +0200

    backports: add eth_prepare_mac_addr_change() and eth_commit_mac_addr_change()

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Patrick Ziegler <patrick.ziegler@fh-kl.de>
---
 backport/compat/compat-3.9.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/backport/compat/compat-3.9.c b/backport/compat/compat-3.9.c
index ba8e3cf..d85a79f 100644
--- a/backport/compat/compat-3.9.c
+++ b/backport/compat/compat-3.9.c
@@ -15,6 +15,7 @@
 #include <linux/netdevice.h>
 #include <linux/if.h>
 #include <linux/if_ether.h>
+#include <linux/etherdevice.h>
 
 #ifdef __sg_page_iter_next
 
-- 
1.7.10.4

[PATCH 05/13] backports: do not copy wrong header files for regulators

[Hauke Mehrtens]

Some of the header files for the regulators framework where used by
regulator core, which does not get backported or some of them are also
used by mfd drivers. Now only the headers which are only used by the
regulator driver are copied, it could still be that these headers are
also used in some platform specific code where the driver gets
registered.
This patch then fixed some dependencies which where wrong because of
using the wrong header files.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 copy-list    |    9 ---------
 dependencies |   58 +++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/copy-list b/copy-list
index 1a7fa93..534f0b4 100644
--- a/copy-list
+++ b/copy-list
@@ -141,25 +141,16 @@ include/linux/platform_data/pn544.h
 # include/linux/regulator/consumer.h and dummy.h
 include/linux/regulator/ab8500.h
 include/linux/regulator/db8500-prcmu.h
-include/linux/regulator/driver.h
 include/linux/regulator/fan53555.h
-include/linux/regulator/fixed.h
 include/linux/regulator/gpio-regulator.h
 include/linux/regulator/lp3971.h
 include/linux/regulator/lp3972.h
 include/linux/regulator/lp872x.h
-include/linux/regulator/machine.h
 include/linux/regulator/max1586.h
 include/linux/regulator/max8649.h
 include/linux/regulator/max8660.h
 include/linux/regulator/max8952.h
 include/linux/regulator/max8973-regulator.h
-include/linux/mfd/max77693.h
-include/linux/mfd/max77693-private.h
-include/linux/mfd/max8998.h
-include/linux/mfd/max8998-private.h
-include/linux/mfd/samsung/s2mps11.h
-include/linux/regulator/of_regulator.h
 include/linux/regulator/tps51632-regulator.h
 include/linux/regulator/tps62360.h
 include/linux/regulator/tps6507x.h
diff --git a/dependencies b/dependencies
index 1ad08ac..cc4837a 100644
--- a/dependencies
+++ b/dependencies
@@ -70,47 +70,55 @@ DRM_QXL 3.3
 # vmlinux.
 REGULATOR 3.4
 # requires some work
-REGULATOR_ARIZONA DISABLE
-REGULATOR_MAX8973 DISABLE
-REGULATOR_MAX77693 3.6
-REGULATOR_MAX77686 DISABLE
-REGULATOR_MAX8997 DISABLE
-REGULATOR_RC5T583 DISABLE
-REGULATOR_TPS62360 DISABLE
-REGULATOR_TPS65910 DISABLE
-REGULATOR_TPS65090 DISABLE
-REGULATOR_TPS65217 DISABLE
-REGULATOR_TPS6586X DISABLE
-REGULATOR_WM831X DISABLE
-REGULATOR_WM8350 DISABLE
-REGULATOR_PALMAS DISABLE
-REGULATOR_DA9055 DISABLE
-REGULATOR_S5M8767 DISABLE
-# These have further core regulator kernel dependencies
-# we can't easily backport.
+REGULATOR_88PM800 3.12
 REGULATOR_AAT2870 3.6
+REGULATOR_AD5398 3.5
+REGULATOR_ARIZONA 3.8
+REGULATOR_AS3711 3.12
 REGULATOR_DA903X 3.5
-REGULATOR_DA9052 3.5
+REGULATOR_DA9052 3.9
+REGULATOR_DA9055 3.8
 REGULATOR_FAN53555 3.5
+REGULATOR_FIXED_VOLTAGE 3.6
+REGULATOR_GPIO 3.6
 REGULATOR_ISL6271A 3.5
 REGULATOR_LP3971 3.6
 REGULATOR_LP3972 3.6
-REGULATOR_LP8755 3.5
+REGULATOR_LP8755 3.6
 REGULATOR_MAX1586 3.6
-REGULATOR_MAX8649 3.5
+REGULATOR_MAX77686 3.7
+REGULATOR_MAX77693 3.11
+REGULATOR_MAX8649 3.10
 REGULATOR_MAX8660 3.5
 REGULATOR_MAX8925 3.5
-REGULATOR_MAX8998 3.5
+REGULATOR_MAX8952 3.6
+REGULATOR_MAX8973 3.6
+REGULATOR_MAX8997 3.8
+REGULATOR_MAX8998 3.11
 REGULATOR_MC13783 3.6
 REGULATOR_MC13892 3.6
 REGULATOR_MC13XXX_CORE 3.6
+REGULATOR_PALMAS 3.11
 REGULATOR_PCAP 3.6
-REGULATOR_PCF50633 3.5
-REGULATOR_TPS51632 3.6
+REGULATOR_PCF50633 3.8
+REGULATOR_PFUZE100 3.6
+REGULATOR_RC5T583 3.6
+REGULATOR_S2MPS11 3.12
+REGULATOR_S5M8767 3.9
+REGULATOR_TPS51632 3.8
 REGULATOR_TPS6105X 3.6
-REGULATOR_TPS65023 3.6
+REGULATOR_TPS62360 3.6
+REGULATOR_TPS62360 3.6
+REGULATOR_TPS65023 3.9
 REGULATOR_TPS6507X 3.6
+REGULATOR_TPS65090 3.9
+REGULATOR_TPS65217 3.6
 REGULATOR_TPS6524X 3.6
+REGULATOR_TPS6586X 3.9
+REGULATOR_TPS65910 3.6
+REGULATOR_TPS65912 3.12
+REGULATOR_WM831X 3.12
+REGULATOR_WM8350 3.12
 REGULATOR_WM8400 3.12
 REGULATOR_WM8994 3.8
 
-- 
1.7.10.4

[PATCH 06/13] backports: add hid_alloc_report_buf()

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/hid.h |    5 +++++
 backport/compat/Makefile              |    1 +
 backport/compat/backport-3.12.c       |   28 ++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 backport/compat/backport-3.12.c

diff --git a/backport/backport-include/linux/hid.h b/backport/backport-include/linux/hid.h
index 2cae9b7..91d3de6 100644
--- a/backport/backport-include/linux/hid.h
+++ b/backport/backport-include/linux/hid.h
@@ -79,4 +79,9 @@ extern bool hid_ignore(struct hid_device *);
 	dev_dbg(&(hid)->dev, fmt, ##arg)
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0)
+#define hid_alloc_report_buf LINUX_BACKPORT(hid_alloc_report_buf)
+u8 *hid_alloc_report_buf(struct hid_report *report, gfp_t flags);
+#endif
+
 #endif /* __BACKPORT_HID_H */
diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index 80c0294..efdeebd 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -36,6 +36,7 @@ compat-$(CPTCFG_BACKPORT_KERNEL_3_8) += compat-3.8.o
 compat-$(CPTCFG_BACKPORT_KERNEL_3_9) += compat-3.9.o
 compat-$(CPTCFG_BACKPORT_KERNEL_3_10) += backport-3.10.o
 compat-$(CPTCFG_BACKPORT_KERNEL_3_11) += backport-3.11.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_12) += backport-3.12.o
 
 compat-$(CPTCFG_BACKPORT_BUILD_KFIFO) += kfifo.o
 compat-$(CPTCFG_BACKPORT_BUILD_GENERIC_ATOMIC64) += compat_atomic.o
diff --git a/backport/compat/backport-3.12.c b/backport/compat/backport-3.12.c
new file mode 100644
index 0000000..8ca9a8e
--- /dev/null
+++ b/backport/compat/backport-3.12.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013  Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * Backport functionality introduced in Linux 3.12.
+ *
+ * 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/hid.h>
+
+/*
+ * Allocator for buffer that is going to be passed to hid_output_report()
+ */
+u8 *hid_alloc_report_buf(struct hid_report *report, gfp_t flags)
+{
+	/*
+	 * 7 extra bytes are necessary to achieve proper functionality
+	 * of implement() working on 8 byte chunks
+	 */
+
+	int len = ((report->size - 1) >> 3) + 1 + (report->id > 0) + 7;
+
+	return kmalloc(len, flags);
+}
+EXPORT_SYMBOL_GPL(hid_alloc_report_buf);
-- 
1.7.10.4

[PATCH 07/13] backports: add include/linux/regulator/pfuze100.h

[Hauke Mehrtens]

This is a new driver which needs a new header file.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 copy-list |    1 +
 1 file changed, 1 insertion(+)

diff --git a/copy-list b/copy-list
index 534f0b4..89147e8 100644
--- a/copy-list
+++ b/copy-list
@@ -151,6 +151,7 @@ include/linux/regulator/max8649.h
 include/linux/regulator/max8660.h
 include/linux/regulator/max8952.h
 include/linux/regulator/max8973-regulator.h
+include/linux/regulator/pfuze100.h
 include/linux/regulator/tps51632-regulator.h
 include/linux/regulator/tps62360.h
 include/linux/regulator/tps6507x.h
-- 
1.7.10.4

[PATCH 08/13] backports: revert the sysfs api change

[Hauke Mehrtens]

Older kernel versions do not support the new sysfs api with dev_groups.
This makes net/wireless/sysfs.c use the old api on older kernels.

This is a backport of this commit:
commit f0bc99c84349ce87af5b35839d19bfb17bb9b27f
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Wed Jul 24 15:05:35 2013 -0700

    net: wireless: convert class code to use dev_groups

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/device.h           |   10 +++++
 .../network/75-sysfs-api/net_wireless_sysfs.patch  |   39 ++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/75-sysfs-api/net_wireless_sysfs.patch

diff --git a/backport/backport-include/linux/device.h b/backport/backport-include/linux/device.h
index 909a534..8e22671 100644
--- a/backport/backport-include/linux/device.h
+++ b/backport/backport-include/linux/device.h
@@ -188,4 +188,14 @@ backport_device_release_driver(struct device *dev)
 #define device_release_driver LINUX_BACKPORT(device_release_driver)
 #endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(3,6,0) */
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
+#define BUS_ATTR_RW(_name)
+#define BUS_ATTR_RO(_name)
+#define DRIVER_ATTR_RW(_name)
+#define DRIVER_ATTR_RO(_name)
+#define CLASS_ATTR_RW(_name)
+#define CLASS_ATTR_RO(_name)
+#define DEVICE_ATTR_RW(_name)
+#define DEVICE_ATTR_RO(_name)
+#endif
 #endif /* __BACKPORT_DEVICE_H */
diff --git a/patches/collateral-evolutions/network/75-sysfs-api/net_wireless_sysfs.patch b/patches/collateral-evolutions/network/75-sysfs-api/net_wireless_sysfs.patch
new file mode 100644
index 0000000..beefae2
--- /dev/null
+++ b/patches/collateral-evolutions/network/75-sysfs-api/net_wireless_sysfs.patch
@@ -0,0 +1,39 @@
+--- a/net/wireless/sysfs.c
++++ b/net/wireless/sysfs.c
+@@ -63,6 +63,7 @@ static ssize_t addresses_show(struct dev
+ }
+ static DEVICE_ATTR_RO(addresses);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+ static struct attribute *ieee80211_attrs[] = {
+ 	&dev_attr_index.attr,
+ 	&dev_attr_macaddress.attr,
+@@ -72,6 +73,16 @@ static struct attribute *ieee80211_attrs
+ 	NULL,
+ };
+ ATTRIBUTE_GROUPS(ieee80211);
++#else
++static struct device_attribute ieee80211_dev_attrs[] = {
++	__ATTR_RO(index),
++	__ATTR_RO(macaddress),
++	__ATTR_RO(address_mask),
++	__ATTR_RO(addresses),
++	__ATTR_RO(name),
++	{}
++};
++#endif
+ 
+ static void wiphy_dev_release(struct device *dev)
+ {
+@@ -151,7 +162,11 @@ struct class ieee80211_class = {
+ 	.name = "ieee80211",
+ 	.owner = THIS_MODULE,
+ 	.dev_release = wiphy_dev_release,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+ 	.dev_groups = ieee80211_groups,
++#else
++	.dev_attrs = ieee80211_dev_attrs,
++#endif
+ 	.dev_uevent = wiphy_uevent,
+ #ifdef CONFIG_PM
+ 	.suspend = wiphy_suspend,
-- 
1.7.10.4

[PATCH 09/13] backports: add some new regulator drivers to default config

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/defconfigs/regulator |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/backport/defconfigs/regulator b/backport/defconfigs/regulator
index c080747..0b1bc27 100644
--- a/backport/defconfigs/regulator
+++ b/backport/defconfigs/regulator
@@ -1,4 +1,5 @@
 CPTCFG_REGULATOR=y
+CPTCFG_REGULATOR_88PM800=y
 CPTCFG_REGULATOR_88PM8607=y
 CPTCFG_REGULATOR_AAT2870=y
 CPTCFG_REGULATOR_AB3100=y
@@ -24,6 +25,7 @@ CPTCFG_REGULATOR_LP8755=y
 CPTCFG_REGULATOR_LP8788=y
 CPTCFG_REGULATOR_MAX1586=y
 CPTCFG_REGULATOR_MAX77686=y
+CPTCFG_REGULATOR_MAX77693=y
 CPTCFG_REGULATOR_MAX8649=y
 CPTCFG_REGULATOR_MAX8660=y
 CPTCFG_REGULATOR_MAX8907=y
@@ -38,6 +40,7 @@ CPTCFG_REGULATOR_MC13XXX_CORE=y
 CPTCFG_REGULATOR_PALMAS=y
 CPTCFG_REGULATOR_PCAP=y
 CPTCFG_REGULATOR_PCF50633=y
+CPTCFG_REGULATOR_PFUZE100=y
 CPTCFG_REGULATOR_RC5T583=y
 CPTCFG_REGULATOR_S2MPS11=y
 CPTCFG_REGULATOR_S5M8767=y
-- 
1.7.10.4

[PATCH 10/13] backports: do not access hw_features in wil6210

[Hauke Mehrtens]

wil6210 now uses netdev->hw_features which is not available in all
kernel versions, do not set it then.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../drivers_net_wireless_ath_wil6210_netdev.patch          |   12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_wil6210_netdev.patch

diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_wil6210_netdev.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_wil6210_netdev.patch
new file mode 100644
index 0000000..5f3e636
--- /dev/null
+++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_wil6210_netdev.patch
@@ -0,0 +1,12 @@
+--- a/drivers/net/wireless/ath/wil6210/netdev.c
++++ b/drivers/net/wireless/ath/wil6210/netdev.c
+@@ -127,7 +127,9 @@ void *wil_if_alloc(struct device *dev, v
+ 
+ 	netdev_attach_ops(ndev, &wil_netdev_ops);
+ 	ndev->ieee80211_ptr = wdev;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
+ 	ndev->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
++#endif
+ 	ndev->features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
+ 	SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy));
+ 	wdev->netdev = ndev;
-- 
1.7.10.4

[PATCH 11/13] backports: backport pci power save for mwifiex

[Hauke Mehrtens]

This patch makes mwifiex use the old suspend resume functions on older
kernels.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../drivers_net_wireless_mwifiex_pcie.patch        |   27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_mwifiex_pcie.patch

diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_mwifiex_pcie.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_mwifiex_pcie.patch
new file mode 100644
index 0000000..4b76db3
--- /dev/null
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_mwifiex_pcie.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/wireless/mwifiex/pcie.c
++++ b/drivers/net/wireless/mwifiex/pcie.c
+@@ -260,6 +260,9 @@ static DEFINE_PCI_DEVICE_TABLE(mwifiex_i
+ MODULE_DEVICE_TABLE(pci, mwifiex_ids);
+ 
+ #ifdef CONFIG_PM_SLEEP
++compat_pci_suspend(mwifiex_pcie_suspend);
++compat_pci_resume(mwifiex_pcie_resume);
++
+ /* Power Management Hooks */
+ static SIMPLE_DEV_PM_OPS(mwifiex_pcie_pm_ops, mwifiex_pcie_suspend,
+ 				mwifiex_pcie_resume);
+@@ -272,9 +275,14 @@ static struct pci_driver __refdata mwifi
+ 	.probe    = mwifiex_pcie_probe,
+ 	.remove   = mwifiex_pcie_remove,
+ #ifdef CONFIG_PM_SLEEP
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
+ 	.driver   = {
+ 		.pm = &mwifiex_pcie_pm_ops,
+ 	},
++#else
++	.suspend    = mwifiex_pcie_suspend_compat,
++	.resume     = mwifiex_pcie_resume_compat,
++#endif
+ #endif
+ 	.shutdown = mwifiex_pcie_shutdown,
+ };
-- 
1.7.10.4

[PATCH 12/13] backports: refresh on next-20130726

[Hauke Mehrtens]

== ckmake-report.log ==

1   2.6.24              [  OK  ]
2   2.6.25              [  OK  ]
3   2.6.26              [  OK  ]
4   2.6.27              [  OK  ]
5   2.6.28              [  OK  ]
6   2.6.29              [  OK  ]
7   2.6.30              [  OK  ]
8   2.6.31              [  OK  ]
9   2.6.32              [  OK  ]
10  2.6.33              [  OK  ]
11  2.6.34              [  OK  ]
12  2.6.35              [  OK  ]
13  2.6.36              [  OK  ]
14  2.6.37              [  OK  ]
15  2.6.38              [  OK  ]
16  2.6.39              [  OK  ]
17  3.0.89              [  OK  ]
18  3.1.10              [  OK  ]
19  3.10.5              [  OK  ]
20  3.11-rc4            [  OK  ]
21  3.2.50              [  OK  ]
22  3.3.8               [  OK  ]
23  3.4.56              [  OK  ]
24  3.5.7               [  OK  ]
25  3.6.11              [  OK  ]
26  3.7.10              [  OK  ]
27  3.8.13              [  OK  ]
28  3.9.11              [  OK  ]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../drivers_gpu_drm_i915_i915_gem.patch            |    2 +-
 .../drivers_gpu_drm_i915_i915_gem.patch            |    2 +-
 .../drivers_gpu_drm_i915_i915_gem.patch            |    2 +-
 .../14-shrinkers-api/drivers_gpu_drm_i915.patch    |   18 ++++++++--------
 .../network/0001-netdev_ops/mwifiex.patch          |    2 +-
 .../network/0001-netdev_ops/qmi_wwan.patch         |    2 +-
 .../network/0001-netdev_ops/sierra_net.patch       |    2 +-
 .../network/0001-netdev_ops/wil6210.patch          |    4 ++--
 .../network/0005-netlink-portid/nl80211.patch      |   22 ++++++++++----------
 .../network/05-usb/ath9k_htc.patch                 |    2 +-
 .../16-bluetooth/net_bluetooth_hidp_core.patch     |   12 +++++------
 .../drivers_net_wireless_mwifiex_sdio.patch        |    2 +-
 .../drivers_net_wireless_mwifiex_sdio.patch        |   10 ++++-----
 .../32-remove-ns-type/net_wireless_sysfs.patch     |    4 ++--
 .../drivers_net_wireless_mwifiex_init.patch        |    2 +-
 .../drivers_bluetooth_ath3k.patch                  |    2 +-
 .../drivers_bluetooth_btusb.patch                  |    2 +-
 .../drivers_net_usb_cdc_mbim.patch                 |    2 +-
 .../drivers_net_usb_cdc_ncm.patch                  |    2 +-
 .../drivers_net_usb_qmi_wwan.patch                 |    2 +-
 .../drivers_net_usb_sierra_net.patch               |    2 +-
 .../drivers_net_wireless_ath_ath9k_hif_usb.patch   |    2 +-
 .../drivers_net_wireless_rt2x00_rt2800usb.patch    |    2 +-
 .../drivers_usb_class_cdc-wdm.patch                |    2 +-
 .../69-wowlan-no-socket/net_wireless_nl80211.patch |    2 +-
 .../network/75-cw1200-sdio-quirk/cw1200.patch      |    2 +-
 26 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_i915_i915_gem.patch
index 3167c0b..9218716 100644
--- a/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_i915_i915_gem.patch
+++ b/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_i915_i915_gem.patch
@@ -1,6 +1,6 @@
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -1292,10 +1292,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
+@@ -1293,10 +1293,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
  		drm_gem_object_unreference_unlocked(obj);
  		return -EINVAL;
  	}
diff --git a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
index 9722df0..4913df8 100644
--- a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
+++ b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
@@ -1,6 +1,6 @@
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -4184,8 +4184,10 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -4182,8 +4182,10 @@ i915_gem_init_hw(struct drm_device *dev)
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	int ret;
  
diff --git a/patches/collateral-evolutions/drm/08-shmem_truncate_range/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/08-shmem_truncate_range/drivers_gpu_drm_i915_i915_gem.patch
index 7d42edc..cc25a62 100644
--- a/patches/collateral-evolutions/drm/08-shmem_truncate_range/drivers_gpu_drm_i915_i915_gem.patch
+++ b/patches/collateral-evolutions/drm/08-shmem_truncate_range/drivers_gpu_drm_i915_i915_gem.patch
@@ -1,6 +1,6 @@
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -1617,7 +1617,13 @@ i915_gem_object_truncate(struct drm_i915
+@@ -1611,7 +1611,13 @@ i915_gem_object_truncate(struct drm_i915
  	 * backing pages, *now*.
  	 */
  	inode = file_inode(obj->base.filp);
diff --git a/patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch b/patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch
index c983ced..96333f8 100644
--- a/patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch
+++ b/patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch
@@ -1,6 +1,6 @@
 --- a/drivers/gpu/drm/i915/i915_dma.c
 +++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -1665,7 +1665,11 @@ int i915_driver_load(struct drm_device *
+@@ -1652,7 +1652,11 @@ int i915_driver_load(struct drm_device *
  	return 0;
  
  out_gem_unload:
@@ -12,7 +12,7 @@
  		unregister_shrinker(&dev_priv->mm.inactive_shrinker);
  
  	if (dev->pdev->msi_enabled)
-@@ -1699,7 +1703,11 @@ int i915_driver_unload(struct drm_device
+@@ -1686,7 +1690,11 @@ int i915_driver_unload(struct drm_device
  
  	i915_teardown_sysfs(dev);
  
@@ -26,7 +26,7 @@
  	mutex_lock(&dev->struct_mutex);
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -53,10 +53,15 @@ static void i915_gem_object_update_fence
+@@ -54,10 +54,15 @@ static void i915_gem_object_update_fence
  					 struct drm_i915_fence_reg *fence,
  					 bool enable);
  
@@ -42,7 +42,7 @@
  static long i915_gem_purge(struct drm_i915_private *dev_priv, long target);
  static long i915_gem_shrink_all(struct drm_i915_private *dev_priv);
  static void i915_gem_object_truncate(struct drm_i915_gem_object *obj);
-@@ -4411,8 +4416,12 @@ i915_gem_load(struct drm_device *dev)
+@@ -4409,8 +4414,12 @@ i915_gem_load(struct drm_device *dev)
  
  	dev_priv->mm.interruptible = true;
  
@@ -55,7 +55,7 @@
  	dev_priv->mm.inactive_shrinker.seeks = DEFAULT_SEEKS;
  	register_shrinker(&dev_priv->mm.inactive_shrinker);
  }
-@@ -4635,8 +4644,14 @@ static bool mutex_is_locked_by(struct mu
+@@ -4633,8 +4642,14 @@ static bool mutex_is_locked_by(struct mu
  #endif
  }
  
@@ -70,7 +70,7 @@
  {
  	struct drm_i915_private *dev_priv =
  		container_of(shrinker,
-@@ -4646,7 +4661,12 @@ i915_gem_inactive_count(struct shrinker
+@@ -4644,7 +4659,12 @@ i915_gem_inactive_count(struct shrinker
  	struct i915_address_space *vm = &dev_priv->gtt.base;
  	struct drm_i915_gem_object *obj;
  	bool unlock = true;
@@ -83,7 +83,7 @@
  
  	if (!mutex_trylock(&dev->struct_mutex)) {
  		if (!mutex_is_locked_by(&dev->struct_mutex, current))
-@@ -4658,6 +4678,17 @@ i915_gem_inactive_count(struct shrinker
+@@ -4656,6 +4676,17 @@ i915_gem_inactive_count(struct shrinker
  		unlock = false;
  	}
  
@@ -101,7 +101,7 @@
  	count = 0;
  	list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list)
  		if (obj->pages_pin_count == 0)
-@@ -4671,6 +4702,7 @@ i915_gem_inactive_count(struct shrinker
+@@ -4669,6 +4700,7 @@ i915_gem_inactive_count(struct shrinker
  	return count;
  }
  
@@ -109,7 +109,7 @@
  static unsigned long
  i915_gem_inactive_scan(struct shrinker *shrinker, struct shrink_control *sc)
  {
-@@ -4704,3 +4736,4 @@ i915_gem_inactive_scan(struct shrinker *
+@@ -4702,3 +4734,4 @@ i915_gem_inactive_scan(struct shrinker *
  		mutex_unlock(&dev->struct_mutex);
  	return freed;
  }
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch b/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch
index 58a38ab..16e6051 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mwifiex/main.c
 +++ b/drivers/net/wireless/mwifiex/main.c
-@@ -749,7 +749,7 @@ static const struct net_device_ops mwifi
+@@ -759,7 +759,7 @@ static const struct net_device_ops mwifi
  void mwifiex_init_priv_params(struct mwifiex_private *priv,
  						struct net_device *dev)
  {
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/qmi_wwan.patch b/patches/collateral-evolutions/network/0001-netdev_ops/qmi_wwan.patch
index 6281c8d..17bafe5 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/qmi_wwan.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/qmi_wwan.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -331,7 +331,7 @@
+@@ -331,7 +331,7 @@ next_desc:
  		dev->net->dev_addr[0] |= 0x02;	/* set local assignment bit */
  		dev->net->dev_addr[0] &= 0xbf;	/* clear "IP" bit */
  	}
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/sierra_net.patch b/patches/collateral-evolutions/network/0001-netdev_ops/sierra_net.patch
index e7ff14b..8120a03 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/sierra_net.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/sierra_net.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/sierra_net.c
 +++ b/drivers/net/usb/sierra_net.c
-@@ -695,7 +695,7 @@
+@@ -695,7 +695,7 @@ static int sierra_net_bind(struct usbnet
  
  	priv->usbnet = dev;
  	priv->ifnum = ifacenum;
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/wil6210.patch b/patches/collateral-evolutions/network/0001-netdev_ops/wil6210.patch
index 423ed53..ac8927a 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/wil6210.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/wil6210.patch
@@ -7,5 +7,5 @@
 -	ndev->netdev_ops = &wil_netdev_ops;
 +	netdev_attach_ops(ndev, &wil_netdev_ops);
  	ndev->ieee80211_ptr = wdev;
- 	SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy));
- 	wdev->netdev = ndev;
+ 	ndev->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
+ 	ndev->features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
index d5a6a12..4664bc1 100644
--- a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
+++ b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
@@ -144,7 +144,7 @@
  				rdev->testmode_info->snd_seq,
  				GFP_KERNEL);
  }
-@@ -6945,7 +6945,7 @@ static int nl80211_remain_on_channel(str
+@@ -6947,7 +6947,7 @@ static int nl80211_remain_on_channel(str
  	if (!msg)
  		return -ENOMEM;
  
@@ -153,7 +153,7 @@
  			     NL80211_CMD_REMAIN_ON_CHANNEL);
  
  	if (IS_ERR(hdr)) {
-@@ -7164,7 +7164,7 @@ static int nl80211_register_mgmt(struct
+@@ -7166,7 +7166,7 @@ static int nl80211_register_mgmt(struct
  	if (!rdev->ops->mgmt_tx)
  		return -EOPNOTSUPP;
  
@@ -162,7 +162,7 @@
  			nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]),
  			nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH]));
  }
-@@ -7245,7 +7245,7 @@ static int nl80211_tx_mgmt(struct sk_buf
+@@ -7247,7 +7247,7 @@ static int nl80211_tx_mgmt(struct sk_buf
  		if (!msg)
  			return -ENOMEM;
  
@@ -171,7 +171,7 @@
  				     NL80211_CMD_FRAME);
  
  		if (IS_ERR(hdr)) {
-@@ -7360,7 +7360,7 @@ static int nl80211_get_power_save(struct
+@@ -7362,7 +7362,7 @@ static int nl80211_get_power_save(struct
  	if (!msg)
  		return -ENOMEM;
  
@@ -180,7 +180,7 @@
  			     NL80211_CMD_GET_POWER_SAVE);
  	if (!hdr) {
  		err = -ENOBUFS;
-@@ -7671,7 +7671,7 @@ static int nl80211_get_wowlan(struct sk_
+@@ -7673,7 +7673,7 @@ static int nl80211_get_wowlan(struct sk_
  	if (!msg)
  		return -ENOMEM;
  
@@ -189,7 +189,7 @@
  			     NL80211_CMD_GET_WOWLAN);
  	if (!hdr)
  		goto nla_put_failure;
-@@ -8096,7 +8096,7 @@ static int nl80211_register_unexpected_f
+@@ -8098,7 +8098,7 @@ static int nl80211_register_unexpected_f
  	if (wdev->ap_unexpected_nlportid)
  		return -EBUSY;
  
@@ -198,7 +198,7 @@
  	return 0;
  }
  
-@@ -8126,7 +8126,7 @@ static int nl80211_probe_client(struct s
+@@ -8128,7 +8128,7 @@ static int nl80211_probe_client(struct s
  	if (!msg)
  		return -ENOMEM;
  
@@ -207,7 +207,7 @@
  			     NL80211_CMD_PROBE_CLIENT);
  
  	if (IS_ERR(hdr)) {
-@@ -8170,13 +8170,13 @@ static int nl80211_register_beacons(stru
+@@ -8172,13 +8172,13 @@ static int nl80211_register_beacons(stru
  	/* First, check if already registered. */
  	spin_lock_bh(&rdev->beacon_registrations_lock);
  	list_for_each_entry(reg, &rdev->beacon_registrations, list) {
@@ -223,7 +223,7 @@
  	list_add(&nreg->list, &rdev->beacon_registrations);
  
  	spin_unlock_bh(&rdev->beacon_registrations_lock);
-@@ -8243,7 +8243,7 @@ static int nl80211_get_protocol_features
+@@ -8245,7 +8245,7 @@ static int nl80211_get_protocol_features
  	if (!msg)
  		return -ENOMEM;
  
@@ -232,7 +232,7 @@
  			     NL80211_CMD_GET_PROTOCOL_FEATURES);
  	if (!hdr)
  		goto nla_put_failure;
-@@ -8318,7 +8318,7 @@ static int nl80211_crit_protocol_start(s
+@@ -8320,7 +8320,7 @@ static int nl80211_crit_protocol_start(s
  
  	ret = rdev_crit_proto_start(rdev, wdev, proto, duration);
  	if (!ret)
@@ -241,7 +241,7 @@
  
  	return ret;
  }
-@@ -10693,12 +10693,12 @@ static int nl80211_netlink_notify(struct
+@@ -10696,12 +10696,12 @@ static int nl80211_netlink_notify(struct
  
  	list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) {
  		list_for_each_entry_rcu(wdev, &rdev->wdev_list, list)
diff --git a/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch b/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch
index fc7ef39..e6b963e 100644
--- a/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch
+++ b/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
 +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -1379,7 +1379,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -1381,7 +1381,9 @@ static struct usb_driver ath9k_hif_usb_d
  	.reset_resume = ath9k_hif_usb_resume,
  #endif
  	.id_table = ath9k_hif_usb_ids,
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
index 75bc7dc..4e861f9 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
@@ -1,6 +1,6 @@
 --- a/net/bluetooth/hidp/core.c
 +++ b/net/bluetooth/hidp/core.c
-@@ -348,6 +348,7 @@ err:
+@@ -353,6 +353,7 @@ err:
  	return ret;
  }
  
@@ -8,7 +8,7 @@
  static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count,
  		unsigned char report_type)
  {
-@@ -405,6 +406,16 @@ err:
+@@ -410,6 +411,16 @@ err:
  	mutex_unlock(&session->report_mutex);
  	return ret;
  }
@@ -25,7 +25,7 @@
  
  static void hidp_idle_timeout(unsigned long arg)
  {
-@@ -693,6 +704,87 @@ static void hidp_close(struct hid_device
+@@ -698,6 +709,87 @@ static void hidp_close(struct hid_device
  {
  }
  
@@ -113,7 +113,7 @@
  static int hidp_parse(struct hid_device *hid)
  {
  	struct hidp_session *session = hid->driver_data;
-@@ -770,7 +862,9 @@ static int hidp_setup_hid(struct hidp_se
+@@ -775,7 +867,9 @@ static int hidp_setup_hid(struct hidp_se
  	hid->dev.parent = &session->conn->hcon->dev;
  	hid->ll_driver = &hidp_hid_driver;
  
@@ -123,7 +123,7 @@
  	hid->hid_output_raw_report = hidp_output_raw_report;
  
  	/* True if device is blacklisted in drivers/hid/hid-core.c */
-@@ -788,6 +882,7 @@ fault:
+@@ -793,6 +887,7 @@ fault:
  
  	return err;
  }
@@ -131,7 +131,7 @@
  
  /* initialize session devices */
  static int hidp_session_dev_init(struct hidp_session *session,
-@@ -850,10 +945,17 @@ static int hidp_session_dev_add(struct h
+@@ -855,10 +950,17 @@ static int hidp_session_dev_add(struct h
  /* remove HID/input devices from their bus systems */
  static void hidp_session_dev_del(struct hidp_session *session)
  {
diff --git a/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch b/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch
index 8704889..ab9b14a 100644
--- a/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch
+++ b/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mwifiex/sdio.c
 +++ b/drivers/net/wireless/mwifiex/sdio.c
-@@ -75,7 +75,9 @@ mwifiex_sdio_probe(struct sdio_func *fun
+@@ -76,7 +76,9 @@ mwifiex_sdio_probe(struct sdio_func *fun
  
  	card->func = func;
  
diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
index 06c18bc..8d2d67d 100644
--- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
+++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mwifiex/sdio.c
 +++ b/drivers/net/wireless/mwifiex/sdio.c
-@@ -140,8 +140,10 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -141,8 +141,10 @@ mwifiex_sdio_remove(struct sdio_func *fu
  	wait_for_completion(&adapter->fw_load);
  
  	if (user_rmmod) {
@@ -11,7 +11,7 @@
  
  		for (i = 0; i < adapter->priv_num; i++)
  			if ((GET_BSS_ROLE(adapter->priv[i]) ==
-@@ -158,6 +160,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -159,6 +161,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
  	kfree(card);
  }
  
@@ -19,7 +19,7 @@
  /*
   * SDIO suspend.
   *
-@@ -257,6 +260,7 @@ static int mwifiex_sdio_resume(struct de
+@@ -258,6 +261,7 @@ static int mwifiex_sdio_resume(struct de
  
  	return 0;
  }
@@ -27,7 +27,7 @@
  
  /* Device ID for SD8786 */
  #define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)
-@@ -282,10 +286,12 @@ static const struct sdio_device_id mwifi
+@@ -283,10 +287,12 @@ static const struct sdio_device_id mwifi
  
  MODULE_DEVICE_TABLE(sdio, mwifiex_ids);
  
@@ -40,7 +40,7 @@
  
  static struct sdio_driver mwifiex_sdio = {
  	.name = "mwifiex_sdio",
-@@ -294,7 +300,9 @@ static struct sdio_driver mwifiex_sdio =
+@@ -295,7 +301,9 @@ static struct sdio_driver mwifiex_sdio =
  	.remove = mwifiex_sdio_remove,
  	.drv = {
  		.owner = THIS_MODULE,
diff --git a/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch b/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch
index e68fab0..7db2dde 100644
--- a/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch
+++ b/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/sysfs.c
 +++ b/net/wireless/sysfs.c
-@@ -135,12 +135,14 @@ static int wiphy_resume(struct device *d
+@@ -138,12 +138,14 @@ static int wiphy_resume(struct device *d
  }
  #endif
  
@@ -15,7 +15,7 @@
  
  struct class ieee80211_class = {
  	.name = "ieee80211",
-@@ -152,8 +154,10 @@ struct class ieee80211_class = {
+@@ -155,8 +157,10 @@ struct class ieee80211_class = {
  	.suspend = wiphy_suspend,
  	.resume = wiphy_resume,
  #endif
diff --git a/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue/drivers_net_wireless_mwifiex_init.patch b/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue/drivers_net_wireless_mwifiex_init.patch
index 30bc0c2..c9e3345 100644
--- a/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue/drivers_net_wireless_mwifiex_init.patch
+++ b/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue/drivers_net_wireless_mwifiex_init.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mwifiex/init.c
 +++ b/drivers/net/wireless/mwifiex/init.c
-@@ -288,8 +288,10 @@ void mwifiex_set_trans_start(struct net_
+@@ -289,8 +289,10 @@ void mwifiex_set_trans_start(struct net_
  {
  	int i;
  
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch
index 9735d1e..ce5b6d7 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch
@@ -1,6 +1,6 @@
 --- a/drivers/bluetooth/ath3k.c
 +++ b/drivers/bluetooth/ath3k.c
-@@ -475,7 +475,9 @@ static struct usb_driver ath3k_driver =
+@@ -473,7 +473,9 @@ static struct usb_driver ath3k_driver =
  	.probe		= ath3k_probe,
  	.disconnect	= ath3k_disconnect,
  	.id_table	= ath3k_table,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch
index 82e4f89..9a2c9e3 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch
@@ -1,6 +1,6 @@
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
-@@ -1624,7 +1624,9 @@ static struct usb_driver btusb_driver =
+@@ -1623,7 +1623,9 @@ static struct usb_driver btusb_driver =
  #endif
  	.id_table	= btusb_table,
  	.supports_autosuspend = 1,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_mbim.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_mbim.patch
index 0feffc8..fb9cff4 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_mbim.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_mbim.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/cdc_mbim.c
 +++ b/drivers/net/usb/cdc_mbim.c
-@@ -417,7 +417,9 @@
+@@ -417,7 +417,9 @@ static struct usb_driver cdc_mbim_driver
  	.resume = cdc_mbim_resume,
  	.reset_resume =	cdc_mbim_resume,
  	.supports_autosuspend = 1,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ncm.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ncm.patch
index c6419fe..bce40fb 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ncm.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ncm.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/cdc_ncm.c
 +++ b/drivers/net/usb/cdc_ncm.c
-@@ -1271,7 +1271,9 @@
+@@ -1271,7 +1271,9 @@ static struct usb_driver cdc_ncm_driver
  	.resume = usbnet_resume,
  	.reset_resume =	usbnet_resume,
  	.supports_autosuspend = 1,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch
index 8f3355d..c4c2130 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_qmi_wwan.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -672,7 +672,9 @@
+@@ -674,7 +674,9 @@ static struct usb_driver qmi_wwan_driver
  	.resume		      =	qmi_wwan_resume,
  	.reset_resume         = qmi_wwan_resume,
  	.supports_autosuspend = 1,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_sierra_net.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_sierra_net.patch
index 553f2ca..c9060b4 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_sierra_net.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_sierra_net.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/sierra_net.c
 +++ b/drivers/net/usb/sierra_net.c
-@@ -959,7 +959,9 @@
+@@ -959,7 +959,9 @@ static struct usb_driver sierra_net_driv
  	.suspend = usbnet_suspend,
  	.resume = usbnet_resume,
  	.no_dynamic_id = 1,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch
index 7bfe884..ff16065 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
 +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -1382,7 +1382,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -1384,7 +1384,9 @@ static struct usb_driver ath9k_hif_usb_d
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
  	.soft_unbind = 1,
  #endif
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch
index 9e3e77b..1674af0 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rt2x00/rt2800usb.c
 +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
-@@ -1350,7 +1350,9 @@ static struct usb_driver rt2800usb_drive
+@@ -1387,7 +1387,9 @@ static struct usb_driver rt2800usb_drive
  	.suspend	= rt2x00usb_suspend,
  	.resume		= rt2x00usb_resume,
  	.reset_resume	= rt2x00usb_resume,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch
index c3af4a1..eb7cb21 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch
@@ -1,6 +1,6 @@
 --- a/drivers/usb/class/cdc-wdm.c
 +++ b/drivers/usb/class/cdc-wdm.c
-@@ -1060,7 +1060,9 @@
+@@ -1060,7 +1060,9 @@ static struct usb_driver wdm_driver = {
  	.post_reset =	wdm_post_reset,
  	.id_table =	wdm_ids,
  	.supports_autosuspend = 1,
diff --git a/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch
index 06c882d..fb20e84 100644
--- a/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -7815,7 +7815,7 @@ static int nl80211_parse_wowlan_tcp(stru
+@@ -7817,7 +7817,7 @@ static int nl80211_parse_wowlan_tcp(stru
  		port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]);
  	else
  		port = 0;
diff --git a/patches/collateral-evolutions/network/75-cw1200-sdio-quirk/cw1200.patch b/patches/collateral-evolutions/network/75-cw1200-sdio-quirk/cw1200.patch
index 2533051..0e18379 100644
--- a/patches/collateral-evolutions/network/75-cw1200-sdio-quirk/cw1200.patch
+++ b/patches/collateral-evolutions/network/75-cw1200-sdio-quirk/cw1200.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/cw1200/cw1200_sdio.c
 +++ b/drivers/net/wireless/cw1200/cw1200_sdio.c
-@@ -253,6 +253,12 @@ static size_t cw1200_sdio_align_size(struct hwbus_priv *self, size_t size)
+@@ -253,6 +253,12 @@ static size_t cw1200_sdio_align_size(str
  	else
  		size = sdio_align_size(self->func, size);
  
-- 
1.7.10.4

[PATCH 13/13] backports: add defconfig for cw1200

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/defconfigs/cw1200 |    9 +++++++++
 backport/defconfigs/wifi   |    3 +++
 2 files changed, 12 insertions(+)
 create mode 100644 backport/defconfigs/cw1200

diff --git a/backport/defconfigs/cw1200 b/backport/defconfigs/cw1200
new file mode 100644
index 0000000..ba03143
--- /dev/null
+++ b/backport/defconfigs/cw1200
@@ -0,0 +1,9 @@
+CPTCFG_CFG80211=m
+CPTCFG_CFG80211_WEXT=y
+CPTCFG_MAC80211=m
+CPTCFG_MAC80211_LEDS=y
+CPTCFG_MAC80211_MESH=y
+CPTCFG_WLAN=y
+CPTCFG_CW1200=m
+CPTCFG_CW1200_WLAN_SDIO=m
+CPTCFG_CW1200_WLAN_SPI=m
diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi
index d55849b..5c9f293 100644
--- a/backport/defconfigs/wifi
+++ b/backport/defconfigs/wifi
@@ -23,6 +23,9 @@ CPTCFG_BRCMSMAC=m
 CPTCFG_CARL9170=m
 CPTCFG_CFG80211=m
 CPTCFG_CFG80211_WEXT=y
+CPTCFG_CW1200=m
+CPTCFG_CW1200_WLAN_SDIO=m
+CPTCFG_CW1200_WLAN_SPI=m
 CPTCFG_HERMES=m
 CPTCFG_HERMES_PRISM=y
 CPTCFG_IPW2100=m
-- 
1.7.10.4

Re: [PATCH 08/13] backports: revert the sysfs api change

[Johannes Berg]

On Fri, 2013-08-16 at 19:26 +0200, Hauke Mehrtens wrote:
>  
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
> +#define BUS_ATTR_RW(_name)
> +#define BUS_ATTR_RO(_name)
> +#define DRIVER_ATTR_RW(_name)
> +#define DRIVER_ATTR_RO(_name)
> +#define CLASS_ATTR_RW(_name)
> +#define CLASS_ATTR_RO(_name)
> +#define DEVICE_ATTR_RW(_name)
> +#define DEVICE_ATTR_RO(_name)
> +#endif

Is that part really helpful? Seems you'd want it to fail, or am I
misunderstanding it?

johannes

Re: [PATCH 04/13] backports: add missing include for is_valid_ether_addr()

[Johannes Berg]

On Fri, 2013-08-16 at 19:26 +0200, Hauke Mehrtens wrote:
> is_valid_ether_addr() is used, but the header here it is declared was
> not included.

Thanks!

johannes

Re: [PATCH 08/13] backports: revert the sysfs api change

[Hauke Mehrtens]

On 08/16/2013 07:35 PM, Johannes Berg wrote:
> On Fri, 2013-08-16 at 19:26 +0200, Hauke Mehrtens wrote:
>>  
>> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
>> +#define BUS_ATTR_RW(_name)
>> +#define BUS_ATTR_RO(_name)
>> +#define DRIVER_ATTR_RW(_name)
>> +#define DRIVER_ATTR_RO(_name)
>> +#define CLASS_ATTR_RW(_name)
>> +#define CLASS_ATTR_RO(_name)
>> +#define DEVICE_ATTR_RW(_name)
>> +#define DEVICE_ATTR_RO(_name)
>> +#endif
> 
> Is that part really helpful? Seems you'd want it to fail, or am I
> misunderstanding it?
> 
> johannes
> 
This is done to eliminate these warnings:

/net/wireless/sysfs.c:36:1: warning: type defaults to ‘int’ in
declaration of ‘DEVICE_ATTR_RO’ [-Wimplicit-int]
/net/wireless/sysfs.c:36:1: warning: parameter names (without types) in
function declaration [enabled by default]
/net/wireless/sysfs.c:37:1: warning: type defaults to ‘int’ in
declaration of ‘DEVICE_ATTR_RO’ [-Wimplicit-int]
/net/wireless/sysfs.c:37:1: warning: parameter names (without types) in
function declaration [enabled by default]
/net/wireless/sysfs.c:38:1: warning: type defaults to ‘int’ in
declaration of ‘DEVICE_ATTR_RO’ [-Wimplicit-int]
/net/wireless/sysfs.c:38:1: warning: parameter names (without types) in
function declaration [enabled by default]
/net/wireless/sysfs.c:46:8: warning: type defaults to ‘int’ in
declaration of ‘DEVICE_ATTR_RO’ [-Wimplicit-int]
/net/wireless/sysfs.c:46:1: warning: parameter names (without types) in
function declaration [enabled by default]
/net/wireless/sysfs.c:64:8: warning: type defaults to ‘int’ in
declaration of ‘DEVICE_ATTR_RO’ [-Wimplicit-int]
/net/wireless/sysfs.c:64:1: warning: parameter names (without types) in
function declaration [enabled by default]
/net/wireless/sysfs.c:64:8: warning: ‘DEVICE_ATTR_RO’ declared ‘static’
but never defined [-Wunused-function]

With this change I get an other warning. ;-)

I do not like this whole patch that much, do you have a better idea to
backport this change:
https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=f0bc99c84349ce87af5b35839d19bfb17bb9b27f

Hauke

Re: [PATCH 08/13] backports: revert the sysfs api change

[Johannes Berg]

On Fri, 2013-08-16 at 20:04 +0200, Hauke Mehrtens wrote:

> This is done to eliminate these warnings:

Fair enough.

> I do not like this whole patch that much, do you have a better idea to
> backport this change:
> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=f0bc99c84349ce87af5b35839d19bfb17bb9b27f

I played with it a bit, and came up with this:

http://p.sipsolutions.net/e3140c53fb57f9ed.txt

It has the small advantage that the patch is smaller and doesn't need to
know about the attributes ... A disadvantage is the runtime overhead on
module load and the extra memory.

As we discussed on IRC, the #else part is only needed to not have to
#ifdef the init_ieee80211_attrs() call, it might very well be better to
ifdef that and get rid of the #else part to avoid having to copy part of
the ATTRIBUTE_GROUPS definition. Not really sure.

johannes

Re: [PATCH 02/13] backports: fix conditional include of arch_phys_wc_add()

[Arik Nemtsov]

On Fri, Aug 16, 2013 at 8:26 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> This fixes a problem introduced in this commit:
> commit c871780b5afa182878884bf5ccd8df4817a2660f
> Author: Arik Nemtsov <arik@wizery.com>
> Date:   Wed Aug 14 10:48:05 2013 +0300
>
>     backports: rename some mem functions to not break custom kernels
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> Cc: Arik Nemtsov <arik@wizery.com>

Thanks for the fix (again). Indeed it was stupid of me to make the
#ifndef redundant.
I'll test it on my setup next week.

Arik

Re: [PATCH 02/13] backports: fix conditional include of arch_phys_wc_add()

[Arik Nemtsov]

On Fri, Aug 16, 2013 at 10:32 PM, Arik Nemtsov <arik@wizery.com> wrote:
> On Fri, Aug 16, 2013 at 8:26 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> This fixes a problem introduced in this commit:
>> commit c871780b5afa182878884bf5ccd8df4817a2660f
>> Author: Arik Nemtsov <arik@wizery.com>
>> Date:   Wed Aug 14 10:48:05 2013 +0300
>>
>>     backports: rename some mem functions to not break custom kernels
>>
>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>> Cc: Arik Nemtsov <arik@wizery.com>
>
> Thanks for the fix (again). Indeed it was stupid of me to make the
> #ifndef redundant.
> I'll test it on my setup next week.

Ok. This doesn't work for me, and it's pretty obvious why that I look
at the code. I'm using a custom 3.9 kernel that contains the patch
adding "arch_phys_wc_add".

If indeed "arch_phys_wc_add" is defined (as is my case), we don't
enter the clause at all and the LINUX_BACKPORT() definition doesn't
happen.
But the code in backport-3.11.c does the following anyway:

EXPORT_SYMBOL_GPL(arch_phys_wc_add);

So we still get the exported symbol "arch_phys_wc_add", clashing with
the kernel's.
Maybe some new define should be added to the backports header file to
control when backport-3.11.c exports the symbol?

Something in io.h along the lines of:

#ifndef arch_phys_wc_add
#define BACKPORTS_DEFINE_arch_phys_wc_add
...

and then condition the symbol export in the .c file on
BACKPORTS_DEFINE_arch_phys_wc_add.

Arik

Re: [PATCH 02/13] backports: fix conditional include of arch_phys_wc_add()

[Hauke Mehrtens]

On 08/18/2013 09:05 AM, Arik Nemtsov wrote:
> On Fri, Aug 16, 2013 at 10:32 PM, Arik Nemtsov <arik@wizery.com> wrote:
>> On Fri, Aug 16, 2013 at 8:26 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>>> This fixes a problem introduced in this commit:
>>> commit c871780b5afa182878884bf5ccd8df4817a2660f
>>> Author: Arik Nemtsov <arik@wizery.com>
>>> Date:   Wed Aug 14 10:48:05 2013 +0300
>>>
>>>     backports: rename some mem functions to not break custom kernels
>>>
>>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>>> Cc: Arik Nemtsov <arik@wizery.com>
>>
>> Thanks for the fix (again). Indeed it was stupid of me to make the
>> #ifndef redundant.
>> I'll test it on my setup next week.
> 
> Ok. This doesn't work for me, and it's pretty obvious why that I look
> at the code. I'm using a custom 3.9 kernel that contains the patch
> adding "arch_phys_wc_add".
> 
> If indeed "arch_phys_wc_add" is defined (as is my case), we don't
> enter the clause at all and the LINUX_BACKPORT() definition doesn't
> happen.
> But the code in backport-3.11.c does the following anyway:
> 
> EXPORT_SYMBOL_GPL(arch_phys_wc_add);
> 
> So we still get the exported symbol "arch_phys_wc_add", clashing with
> the kernel's.
> Maybe some new define should be added to the backports header file to
> control when backport-3.11.c exports the symbol?
> 
> Something in io.h along the lines of:
> 
> #ifndef arch_phys_wc_add
> #define BACKPORTS_DEFINE_arch_phys_wc_add
> ...
> 
> and then condition the symbol export in the .c file on
> BACKPORTS_DEFINE_arch_phys_wc_add.
> 
> Arik

Thanks for testing, I will send a new version.

Hauke