backport patches: rename/combine some patches

It's not efficient to have a large number of patches,
but necessary to split patches per driver or subsystem
to allow copying only parts. I had split them per file
as that was easy to generate, now combine a few again
and move some into the higher directory level.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

43 files changed, 104 insertions, 104 deletions

diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_ath6kl_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/ath6kl.patch
index fe710da4..fe710da4 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_ath6kl_main.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/ath6kl.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch
index 5e0fb047..5e0fb047 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/atl1e.patch
index e359e872..e359e872 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/atl1e.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl1.patch b/patches/collateral-evolutions/network/0001-netdev_ops/atlx.patch
index a261c25c..de6ad23e 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl1.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/atlx.patch
@@ -9,3 +9,14 @@
  	netdev->watchdog_timeo = 5 * HZ;
  	netif_napi_add(netdev, &adapter->napi, atl1_rings_clean, 64);
  
+--- a/drivers/net/ethernet/atheros/atlx/atl2.c
++++ b/drivers/net/ethernet/atheros/atlx/atl2.c
+@@ -1396,7 +1396,7 @@ static int atl2_probe(struct pci_dev *pd
+ 
+ 	atl2_setup_pcicmd(pdev);
+ 
+-	netdev->netdev_ops = &atl2_netdev_ops;
++	netdev_attach_ops(netdev, &atl2_netdev_ops);
+ 	atl2_set_ethtool_ops(netdev);
+ 	netdev->watchdog_timeo = 5 * HZ;
+ 	strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_broadcom_b44.patch b/patches/collateral-evolutions/network/0001-netdev_ops/b44.patch
index 0747b240..0747b240 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_broadcom_b44.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/b44.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/net_bluetooth_bnep_netdev.patch b/patches/collateral-evolutions/network/0001-netdev_ops/bluetooth_bnep.patch
index 3460e0c9..3460e0c9 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/net_bluetooth_bnep_netdev.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/bluetooth_bnep.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl2.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl2.patch
deleted file mode 100644
index 7bbcb2b5..00000000
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/ethernet/atheros/atlx/atl2.c
-+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
-@@ -1396,7 +1396,7 @@ static int atl2_probe(struct pci_dev *pd
- 
- 	atl2_setup_pcicmd(pdev);
- 
--	netdev->netdev_ops = &atl2_netdev_ops;
-+	netdev_attach_ops(netdev, &atl2_netdev_ops);
- 	atl2_set_ethtool_ops(netdev);
- 	netdev->watchdog_timeo = 5 * HZ;
- 	strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_main.patch
deleted file mode 100644
index bd5e2ae6..00000000
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_main.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/wireless/libertas/main.c
-+++ b/drivers/net/wireless/libertas/main.c
-@@ -993,7 +993,7 @@ struct lbs_private *lbs_add_card(void *c
- 	wdev->netdev = dev;
- 	priv->dev = dev;
- 
-- 	dev->netdev_ops = &lbs_netdev_ops;
-+	netdev_attach_ops(dev, &lbs_netdev_ops);
- 	dev->watchdog_timeo = 5 * HZ;
- 	dev->ethtool_ops = &lbs_ethtool_ops;
- 	dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2100.patch b/patches/collateral-evolutions/network/0001-netdev_ops/ipw2100.patch
index 1cde9f46..1cde9f46 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2100.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/ipw2100.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2200.patch b/patches/collateral-evolutions/network/0001-netdev_ops/ipw2200.patch
index afa84cd2..afa84cd2 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2200.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/ipw2200.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_mesh.patch b/patches/collateral-evolutions/network/0001-netdev_ops/libertas.patch
index f7b18855..b760f99a 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_mesh.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/libertas.patch
@@ -1,3 +1,14 @@
+--- a/drivers/net/wireless/libertas/main.c
++++ b/drivers/net/wireless/libertas/main.c
+@@ -993,7 +993,7 @@ struct lbs_private *lbs_add_card(void *c
+ 	wdev->netdev = dev;
+ 	priv->dev = dev;
+ 
+- 	dev->netdev_ops = &lbs_netdev_ops;
++	netdev_attach_ops(dev, &lbs_netdev_ops);
+ 	dev->watchdog_timeo = 5 * HZ;
+ 	dev->ethtool_ops = &lbs_ethtool_ops;
+ 	dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
 --- a/drivers/net/wireless/libertas/mesh.c
 +++ b/drivers/net/wireless/libertas/mesh.c
 @@ -1015,7 +1015,7 @@ static int lbs_add_mesh(struct lbs_priva
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/net_mac80211_iface.patch b/patches/collateral-evolutions/network/0001-netdev_ops/mac80211.patch
index bb7023dc..bb7023dc 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/net_mac80211_iface.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/mac80211.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mac80211_hwsim.patch b/patches/collateral-evolutions/network/0001-netdev_ops/mac80211_hwsim.patch
index a9842b28..a9842b28 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mac80211_hwsim.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/mac80211_hwsim.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mwifiex_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch
index 74f2c8e6..74f2c8e6 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mwifiex_main.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_orinoco_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/orinoco.patch
index e093a0bf..e093a0bf 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_orinoco_main.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/orinoco.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_usb_rndis_host.patch b/patches/collateral-evolutions/network/0001-netdev_ops/rndis.patch
index 3ced6304..3ced6304 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_usb_rndis_host.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/rndis.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_rndis_wlan.patch b/patches/collateral-evolutions/network/0001-netdev_ops/rndis_wlan.patch
index 98facfb9..98facfb9 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_rndis_wlan.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/rndis_wlan.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_usb_usbnet.patch b/patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch
index f2bf6ecc..f2bf6ecc 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_usb_usbnet.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/net_wireless_wext-core.patch b/patches/collateral-evolutions/network/0001-netdev_ops/wext.patch
index 30d7e127..30d7e127 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/net_wireless_wext-core.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/wext.patch
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_wil6210_netdev.patch b/patches/collateral-evolutions/network/0001-netdev_ops/wil6210.patch
index a2d03291..a2d03291 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_wil6210_netdev.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/wil6210.patch
diff --git a/patches/collateral-evolutions/network/0002-net-misc/net_bluetooth_bnep_netdev.patch b/patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch
index 4bebe22e..4bebe22e 100644
--- a/patches/collateral-evolutions/network/0002-net-misc/net_bluetooth_bnep_netdev.patch
+++ b/patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch
diff --git a/patches/collateral-evolutions/network/0002-net-misc/drivers_net_wireless_libertas_defs.patch b/patches/collateral-evolutions/network/0002-net-misc/libertas.patch
index 5039684e..5039684e 100644
--- a/patches/collateral-evolutions/network/0002-net-misc/drivers_net_wireless_libertas_defs.patch
+++ b/patches/collateral-evolutions/network/0002-net-misc/libertas.patch
diff --git a/patches/collateral-evolutions/network/0002-net-misc/net_mac80211_iface.patch b/patches/collateral-evolutions/network/0002-net-misc/mac80211.patch
index 6eb86745..6eb86745 100644
--- a/patches/collateral-evolutions/network/0002-net-misc/net_mac80211_iface.patch
+++ b/patches/collateral-evolutions/network/0002-net-misc/mac80211.patch
diff --git a/patches/collateral-evolutions/network/0002-net-misc/drivers_net_usb_rndis_host.patch b/patches/collateral-evolutions/network/0002-net-misc/rndis.patch
index ea802ffe..ea802ffe 100644
--- a/patches/collateral-evolutions/network/0002-net-misc/drivers_net_usb_rndis_host.patch
+++ b/patches/collateral-evolutions/network/0002-net-misc/rndis.patch
diff --git a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/net_mac80211_iface.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
index 2b6a8a46..2b6a8a46 100644
--- a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/net_mac80211_iface.patch
+++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
diff --git a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/drivers_net_wireless_orinoco_main.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/orinoco.patch
index 94dc523e..94dc523e 100644
--- a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/drivers_net_wireless_orinoco_main.patch
+++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/orinoco.patch
diff --git a/patches/collateral-evolutions/network/0004-wext-namespace/net_wireless_wext-core.patch b/patches/collateral-evolutions/network/0004-wext-namespace.patch
index d7e18b6e..606001b6 100644
--- a/patches/collateral-evolutions/network/0004-wext-namespace/net_wireless_wext-core.patch
+++ b/patches/collateral-evolutions/network/0004-wext-namespace.patch
@@ -1,3 +1,7 @@
+
+This patch backports the namespace changes added
+through net/wireless/wext.c.
+
 --- a/net/wireless/wext-core.c
 +++ b/net/wireless/wext-core.c
 @@ -342,6 +342,7 @@ static const int compat_event_type_size[
diff --git a/patches/collateral-evolutions/network/0004-wext-namespace/INFO b/patches/collateral-evolutions/network/0004-wext-namespace/INFO
deleted file mode 100644
index 66bde409..00000000
--- a/patches/collateral-evolutions/network/0004-wext-namespace/INFO
+++ /dev/null
@@ -1,4 +0,0 @@
-
-This patch backports the namespace changes added
-through net/wireless/wext.c.
-
diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/drivers_net_wireless_mac80211_hwsim.patch b/patches/collateral-evolutions/network/0005-netlink-portid/mac80211_hwsim.patch
index c1ab9423..c1ab9423 100644
--- a/patches/collateral-evolutions/network/0005-netlink-portid/drivers_net_wireless_mac80211_hwsim.patch
+++ b/patches/collateral-evolutions/network/0005-netlink-portid/mac80211_hwsim.patch
diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
index 0e2b9818..0e2b9818 100644
--- a/patches/collateral-evolutions/network/0005-netlink-portid/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
diff --git a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels/INFO b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch
index 04893226..ff7abf75 100644
--- a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels/INFO
+++ b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch
@@ -26,3 +26,21 @@ Date:   Fri Mar 1 14:03:49 2013 +0100
     
     Also increase the size for the get_wiphy command.
 
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -1600,6 +1600,7 @@ static int nl80211_dump_wiphy(struct sk_
+ 						 &cb->args[2],
+ 						 &cb->args[3]);
+ 			if (ret < 0) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
+ 				/*
+ 				 * If sending the wiphy data didn't fit (ENOBUFS
+ 				 * or EMSGSIZE returned), this SKB is still
+@@ -1620,6 +1621,7 @@ static int nl80211_dump_wiphy(struct sk_
+ 					mutex_unlock(&cfg80211_mutex);
+ 					return 1;
+ 				}
++#endif
+ 				idx--;
+ 				break;
+ 			}
diff --git a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels/net_wireless_nl80211.patch
deleted file mode 100644
index 974d5803..00000000
--- a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels/net_wireless_nl80211.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -1600,6 +1600,7 @@ static int nl80211_dump_wiphy(struct sk_
- 						 &cb->args[2],
- 						 &cb->args[3]);
- 			if (ret < 0) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
- 				/*
- 				 * If sending the wiphy data didn't fit (ENOBUFS
- 				 * or EMSGSIZE returned), this SKB is still
-@@ -1620,6 +1621,7 @@ static int nl80211_dump_wiphy(struct sk_
- 					mutex_unlock(&cfg80211_mutex);
- 					return 1;
- 				}
-+#endif
- 				idx--;
- 				break;
- 			}
diff --git a/patches/collateral-evolutions/network/02-ksize/drivers_net_wireless_orinoco_wext.patch b/patches/collateral-evolutions/network/0007-ksize-orinoco.patch
index 75e08194..934e2fae 100644
--- a/patches/collateral-evolutions/network/02-ksize/drivers_net_wireless_orinoco_wext.patch
+++ b/patches/collateral-evolutions/network/0007-ksize-orinoco.patch
@@ -1,3 +1,15 @@
+ksize() was added as of 2.6.29, it gives you the actual
+size of the allocated data. Since we have no support for
+this we simply do not optimize for it and deal with
+large alloocations for the IEs.
+
+We technically could backport this as
+
+define ksize(bleh) SOME_LARGE_NUMBER
+
+but doing it this way emphasis careful review
+of the situation.
+
 --- a/drivers/net/wireless/orinoco/wext.c
 +++ b/drivers/net/wireless/orinoco/wext.c
 @@ -31,8 +31,22 @@ static int orinoco_set_key(struct orinoc
diff --git a/patches/collateral-evolutions/network/03-rfkill/INFO b/patches/collateral-evolutions/network/0008-rfkill.patch
index 9aff38f9..7e494a10 100644
--- a/patches/collateral-evolutions/network/03-rfkill/INFO
+++ b/patches/collateral-evolutions/network/0008-rfkill.patch
@@ -28,3 +28,25 @@ mac80211's subif_open() call :
 
 This would do the policing from within mac80211.
 
+--- a/net/rfkill/core.c
++++ b/net/rfkill/core.c
+@@ -826,7 +826,7 @@ static int rfkill_resume(struct device *
+ }
+ 
+ static struct class rfkill_class = {
+-	.name		= "rfkill",
++	.name		= "rfkill_backport",
+ 	.dev_release	= rfkill_release,
+ 	.dev_attrs	= rfkill_dev_attrs,
+ 	.dev_uevent	= rfkill_dev_uevent,
+--- a/net/rfkill/input.c
++++ b/net/rfkill/input.c
+@@ -230,7 +230,7 @@ static int rfkill_connect(struct input_h
+ 
+ 	handle->dev = dev;
+ 	handle->handler = handler;
+-	handle->name = "rfkill";
++	handle->name = "rfkill_backport";
+ 
+ 	/* causes rfkill_start() to be called */
+ 	error = input_register_handle(handle);
diff --git a/patches/collateral-evolutions/network/02-ksize/INFO b/patches/collateral-evolutions/network/02-ksize/INFO
deleted file mode 100644
index 1bb12887..00000000
--- a/patches/collateral-evolutions/network/02-ksize/INFO
+++ /dev/null
@@ -1,12 +0,0 @@
-ksize() was added as of 2.6.29, it gives you the actual
-size of the allocated data. Since we have no support for
-this we simply do not optimize for it and deal with
-large alloocations for the IEs.
-
-We technically could backport this as
-
-define ksize(bleh) SOME_LARGE_NUMBER
-
-but doing it this way emphasis careful review
-of the situation.
-
diff --git a/patches/collateral-evolutions/network/03-rfkill/net_rfkill_core.patch b/patches/collateral-evolutions/network/03-rfkill/net_rfkill_core.patch
deleted file mode 100644
index 406ae534..00000000
--- a/patches/collateral-evolutions/network/03-rfkill/net_rfkill_core.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/net/rfkill/core.c
-+++ b/net/rfkill/core.c
-@@ -826,7 +826,7 @@ static int rfkill_resume(struct device *
- }
- 
- static struct class rfkill_class = {
--	.name		= "rfkill",
-+	.name		= "rfkill_backport",
- 	.dev_release	= rfkill_release,
- 	.dev_attrs	= rfkill_dev_attrs,
- 	.dev_uevent	= rfkill_dev_uevent,
diff --git a/patches/collateral-evolutions/network/03-rfkill/net_rfkill_input.patch b/patches/collateral-evolutions/network/03-rfkill/net_rfkill_input.patch
deleted file mode 100644
index 947c4375..00000000
--- a/patches/collateral-evolutions/network/03-rfkill/net_rfkill_input.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/net/rfkill/input.c
-+++ b/net/rfkill/input.c
-@@ -230,7 +230,7 @@ static int rfkill_connect(struct input_h
- 
- 	handle->dev = dev;
- 	handle->handler = handler;
--	handle->name = "rfkill";
-+	handle->name = "rfkill_backport";
- 
- 	/* causes rfkill_start() to be called */
- 	error = input_register_handle(handle);
diff --git a/patches/collateral-evolutions/network/04-netns/net_wireless_core.patch b/patches/collateral-evolutions/network/04-netns/cfg80211.patch
index 3fe83ddf..0acb3d84 100644
--- a/patches/collateral-evolutions/network/04-netns/net_wireless_core.patch
+++ b/patches/collateral-evolutions/network/04-netns/cfg80211.patch
@@ -84,3 +84,15 @@
  	destroy_workqueue(cfg80211_wq);
  }
  module_exit(cfg80211_exit);
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -6740,7 +6740,9 @@ static int nl80211_wiphy_netns(struct sk
+ 	if (!net_eq(wiphy_net(&rdev->wiphy), net))
+ 		err = cfg80211_switch_netns(rdev, net);
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ 	put_net(net);
++#endif
+ 	return err;
+ }
+ 
diff --git a/patches/collateral-evolutions/network/04-netns/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/04-netns/net_wireless_nl80211.patch
deleted file mode 100644
index b011cf39..00000000
--- a/patches/collateral-evolutions/network/04-netns/net_wireless_nl80211.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -6740,7 +6740,9 @@ static int nl80211_wiphy_netns(struct sk
- 	if (!net_eq(wiphy_net(&rdev->wiphy), net))
- 		err = cfg80211_switch_netns(rdev, net);
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- 	put_net(net);
-+#endif
- 	return err;
- }
- 
diff --git a/patches/collateral-evolutions/network/04-netns/net_wireless_wext-proc.patch b/patches/collateral-evolutions/network/04-netns/net_wireless_wext-proc.patch
deleted file mode 100644
index de6f664c..00000000
--- a/patches/collateral-evolutions/network/04-netns/net_wireless_wext-proc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/net/wireless/wext-proc.c
-+++ b/net/wireless/wext-proc.c
-@@ -98,7 +98,11 @@ static void *wireless_dev_seq_start(stru
- 		return SEQ_START_TOKEN;
- 
- 	off = 1;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
- 	for_each_netdev(net, dev)
-+#else
-+	for_each_netdev(net)
-+#endif
- 		if (off++ == *pos)
- 			return dev;
- 	return NULL;
diff --git a/patches/collateral-evolutions/network/04-netns/net_wireless_wext-core.patch b/patches/collateral-evolutions/network/04-netns/wext.patch
index 6b995e4b..b619e1f5 100644
--- a/patches/collateral-evolutions/network/04-netns/net_wireless_wext-core.patch
+++ b/patches/collateral-evolutions/network/04-netns/wext.patch
@@ -29,3 +29,17 @@
  
  static DECLARE_WORK(wireless_nlevent_work, wireless_nlevent_process);
  
+--- a/net/wireless/wext-proc.c
++++ b/net/wireless/wext-proc.c
+@@ -98,7 +98,11 @@ static void *wireless_dev_seq_start(stru
+ 		return SEQ_START_TOKEN;
+ 
+ 	off = 1;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ 	for_each_netdev(net, dev)
++#else
++	for_each_netdev(net)
++#endif
+ 		if (off++ == *pos)
+ 			return dev;
+ 	return NULL;
diff --git a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_ath_ath9k_hif_usb.patch b/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch
index a681f60d..a681f60d 100644
--- a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_ath_ath9k_hif_usb.patch
+++ b/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch
diff --git a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_p54_p54usb.patch b/patches/collateral-evolutions/network/05-usb/p54usb.patch
index 7862af83..7862af83 100644
--- a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_p54_p54usb.patch
+++ b/patches/collateral-evolutions/network/05-usb/p54usb.patch