2011-09-21 17:06:24

by Hauke Mehrtens

Subject: [PATCH 1/2] compat-wireless: make patches apply again

Signed-off-by: Hauke Mehrtens <[email protected]>
---
patches/09-threaded-irq.patch | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index 7df41f6..d83b6d4 100644
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -6,7 +6,7 @@ thread in process context as well.

--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -4174,8 +4174,13 @@ redo:
+@@ -4175,8 +4175,13 @@ redo:
if (b43_bus_host_is_sdio(dev->dev)) {
b43_sdio_free_irq(dev);
} else {
@@ -20,7 +20,7 @@ thread in process context as well.
}
mutex_lock(&wl->mutex);
dev = wl->current_dev;
-@@ -4215,9 +4220,17 @@ static int b43_wireless_core_start(struc
+@@ -4216,9 +4221,17 @@ static int b43_wireless_core_start(struc
goto out;
}
} else {
@@ -38,7 +38,7 @@ thread in process context as well.
if (err) {
b43err(dev->wl, "Cannot request IRQ-%d\n",
dev->dev->irq);
-@@ -5006,6 +5019,10 @@ static int b43_setup_bands(struct b43_wl
+@@ -5007,6 +5020,10 @@ static int b43_setup_bands(struct b43_wl

static void b43_wireless_core_detach(struct b43_wldev *dev)
{
@@ -122,10 +122,10 @@ thread in process context as well.
return 0;
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
-@@ -626,6 +626,10 @@ struct wl1271 {
+@@ -630,6 +630,10 @@ struct wl1271 {

- /* number of currently active RX BA sessions */
- int ba_rx_session_count;
+ /* AP-mode - number of currently connected stations */
+ int active_sta_count;
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ struct compat_threaded_irq irq_compat;
--
1.7.4.1

2011-09-21 17:06:27

by Hauke Mehrtens

Subject: [PATCH 2/2] compat-wireless: remove old config options

Both config options have be removed from the Kconfig files in the
kernel and are not used by the code any more.

Signed-off-by: Hauke Mehrtens <[email protected]>
---
config.mk | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/config.mk b/config.mk
index 802bf38..3463f83 100644
--- a/config.mk
+++ b/config.mk
@@ -252,7 +252,6 @@ CONFIG_IWLAGN=m
# CONFIG_IWLWIFI_DEVICE_TRACING=y
# CONFIG_IWLWIFI_DEVICE_SVTOOL=y
# CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE=y
-CONFIG_IWL_P2P=y

CONFIG_IWLWIFI_LEGACY=m
CONFIG_COMPAT_IWL4965=m
@@ -623,7 +622,6 @@ endif #CONFIG_COMPAT_STAGING
ifdef CONFIG_CRC7
CONFIG_WL1251=m
CONFIG_WL12XX=m
-CONFIG_WL12XX_HT=y
endif #CONFIG_CRC7

CONFIG_MWIFIEX=m
--
1.7.4.1

2011-09-21 23:04:49

by Luis R. Rodriguez

Subject: Re: [PATCH 2/2] compat-wireless: remove old config options

On Wed, Sep 21, 2011 at 10:06 AM, Hauke Mehrtens <[email protected]> wrote:
> Both config options have be removed from the Kconfig files in the
> kernel and are not used by the code any more.
>
> Signed-off-by: Hauke Mehrtens <[email protected]>

Thanks, applied and pushed all 4 patches to both github and
infradead.org in case we get nuked.

Luis