compat-wireless: address moving of TI drivers

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

diff --git a/config.mk b/config.mk
index f9260e2e7eea64185a4c935a666fb85f4abd568b..22a8cf13b05ff95d107ec59729d71dc995065176 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -572,7 +572,7 @@ endif #CONFIG_WL12XX_PLATFORM_DATA
 
 ifndef CONFIG_COMPAT_KERNEL_2_6_32
 ifdef CONFIG_WL12XX_PLATFORM_DATA
-export CONFIG_COMPAT_WL12XX_SDIO=m
+export CONFIG_COMPAT_WLCORE_SDIO=m
 endif #CONFIG_WL12XX_PLATFORM_DATA
 endif #CONFIG_COMPAT_KERNEL_2_6_32
 

diff --git a/patches/06-header-changes.patch b/patches/06-header-changes.patch
index 3fdb2ff34cd8d15771d4723cb6ea8e69c42c41e9..25b486c91b0708ee43468e5e8bb7aaceccab4304 100644 (file)
--- a/patches/06-header-changes.patch
+++ b/patches/06-header-changes.patch
@@ -26,8 +26,8 @@ cases.
  #include <linux/module.h>
  
  /*
---- a/drivers/net/wireless/wl1251/main.c
-+++ b/drivers/net/wireless/wl1251/main.c
+--- a/drivers/net/wireless/ti/wl1251/main.c
++++ b/drivers/net/wireless/ti/wl1251/main.c
 @@ -24,6 +24,9 @@
  #include <linux/firmware.h>
  #include <linux/delay.h>
@@ -38,8 +38,8 @@ cases.
  #include <linux/crc32.h>
  #include <linux/etherdevice.h>
  #include <linux/vmalloc.h>
---- a/drivers/net/wireless/wl1251/spi.c
-+++ b/drivers/net/wireless/wl1251/spi.c
+--- a/drivers/net/wireless/ti/wl1251/spi.c
++++ b/drivers/net/wireless/t/wl1251/spi.c
 @@ -24,6 +24,9 @@
  #include <linux/module.h>
  #include <linux/slab.h>

diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index f820e5e3c7b3928e341074a3a93829792c270d73..5f1b117332f010999a4a471ff7a9c398b464075b 100644 (file)
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -90,25 +90,25 @@ CONFIG_BT_HIDP does not build with older kernel versions.
 +obj-$(CONFIG_COMPAT_BT_HIDP) += hidp.o
  
  hidp-objs := core.o sock.o
---- a/drivers/net/wireless/wl12xx/Makefile
-+++ b/drivers/net/wireless/wl12xx/Makefile
-@@ -7,7 +7,7 @@ wl12xx_sdio-objs       = sdio.o
- wl12xx-$(CONFIG_NL80211_TESTMODE)     += testmode.o
- obj-$(CONFIG_WL12XX)                  += wl12xx.o
- obj-$(CONFIG_WL12XX_SPI)              += wl12xx_spi.o
--obj-$(CONFIG_WL12XX_SDIO)             += wl12xx_sdio.o
-+obj-$(CONFIG_COMPAT_WL12XX_SDIO)              += wl12xx_sdio.o
+--- a/drivers/net/wireless/ti/wlcore/Makefile
++++ b/drivers/net/wireless/ti/wlcore/Makefile
+@@ -7,7 +7,7 @@ wlcore_sdio-objs       = sdio.o
+ wlcore-$(CONFIG_NL80211_TESTMODE)     += testmode.o
+ obj-$(CONFIG_WLCORE)                  += wlcore.o
+ obj-$(CONFIG_WLCORE_SPI)              += wlcore_spi.o
+-obj-$(CONFIG_WLCORE_SDIO)             += wlcore_sdio.o
++obj-$(CONFIG_COMPAT_WLCORE_SDIO)      += wlcore_sdio.o
  
  # small builtin driver bit
  obj-$(CONFIG_WL12XX_PLATFORM_DATA)    += wl12xx_platform_data.o
---- a/drivers/net/wireless/wl1251/Makefile
-+++ b/drivers/net/wireless/wl1251/Makefile
+--- a/drivers/net/wireless/ti/wl1251/Makefile
++++ b/drivers/net/wireless/ti/wl1251/Makefile
 @@ -5,6 +5,6 @@ wl1251_sdio-objs       += sdio.o
  
  obj-$(CONFIG_WL1251)          += wl1251.o
  obj-$(CONFIG_WL1251_SPI)      += wl1251_spi.o
 -obj-$(CONFIG_WL1251_SDIO)     += wl1251_sdio.o
-+obj-$(CONFIG_COMPAT_WL1251_SDIO)      += wl1251_sdio.o
++obj-$(CONFIG_COMPAT_WL1251_SDIO)+= wl1251_sdio.o
  
  ccflags-y += -D__CHECK_ENDIAN__
 --- a/drivers/net/wireless/ath/ath9k/Makefile

diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index 709d42ddfd95d99cfb5954ee05892f9b770a23d1..c80766af8931466f09ba865f44922a1123c47ee3 100644 (file)
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -61,8 +61,8 @@ thread in process context as well.
  };
  
  /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */
---- a/drivers/net/wireless/wl12xx/main.c
-+++ b/drivers/net/wireless/wl12xx/main.c
+--- a/drivers/net/wireless/ti/wlcore/main.c
++++ b/drivers/net/wireless/ti/wlcore/main.c
 @@ -5493,14 +5493,25 @@ static int __devinit wl12xx_probe(struct
  
        platform_set_drvdata(pdev, wl);
@@ -101,7 +101,7 @@ thread in process context as well.
  
  out_free_hw:
        wl1271_free_hw(wl);
-@@ -5572,7 +5587,12 @@ static int __devexit wl12xx_remove(struc
+@@ -5081,7 +5081,12 @@ int __devexit wlcore_remove(struct platf
                disable_irq_wake(wl->irq);
        }
        wl1271_unregister_hw(wl);
@@ -111,19 +111,19 @@ thread in process context as well.
 +#else
        free_irq(wl->irq, wl);
 +#endif
-       wl1271_free_hw(wl);
+       wlcore_free_hw(wl);
  
        return 0;
---- a/drivers/net/wireless/wl12xx/wl12xx.h
-+++ b/drivers/net/wireless/wl12xx/wl12xx.h
-@@ -498,6 +498,10 @@ struct wl1271 {
+--- a/drivers/net/wireless/ti/wlcore/wlcore.h
++++ b/drivers/net/wireless/ti/wlcore/wlcore.h
+@@ -349,6 +349,10 @@ struct wl1271 {
  
-       /* work to fire when Tx is stuck */
-       struct delayed_work tx_watchdog_work;
+       /* size of the private FW status data */
+       size_t fw_status_priv_len;
 +
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
 +      struct compat_threaded_irq irq_compat;
 +#endif
  };
  
- struct wl1271_station {
+ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev);

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index 8b26983cd298ea3b7e22b9a00742fc3414a8f6de..b9461b629751ec9dbff5a353d7d4cb81cc97b928 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -534,8 +534,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  }
  
  static void rtl8187_configure_filter(struct ieee80211_hw *dev,
---- a/drivers/net/wireless/wl12xx/main.c
-+++ b/drivers/net/wireless/wl12xx/main.c
+--- a/drivers/net/wireless/ti/wlcore/main.c
++++ b/drivers/net/wireless/ti/wlcore/main.c
 @@ -2748,11 +2748,20 @@ struct wl1271_filter_params {
        u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN];
  };

diff --git a/patches/45-remove-platform-id-table.patch b/patches/45-remove-platform-id-table.patch
index 1c283c4a4dfb937cab484f74ac4022ed53dbf04d..a6ca6e2f4535730366182f2b85e1e2a0670d340c 100644 (file)
--- a/patches/45-remove-platform-id-table.patch
+++ b/patches/45-remove-platform-id-table.patch
@@ -1,7 +1,7 @@
---- a/drivers/net/wireless/wl12xx/main.c
-+++ b/drivers/net/wireless/wl12xx/main.c
-@@ -5631,16 +5631,20 @@ static int __devexit wl12xx_remove(struc
-       return 0;
+--- a/drivers/net/wireless/ti/wl12xx/main.c
++++ b/drivers/net/wireless/ti/wl12xx/main.c
+@@ -1350,16 +1350,20 @@ static int __devinit wl12xx_probe(struct
+       return wlcore_probe(wl, pdev);
  }
  
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
@@ -14,7 +14,7 @@
  
  static struct platform_driver wl12xx_driver = {
        .probe          = wl12xx_probe,
-       .remove         = __devexit_p(wl12xx_remove),
+       .remove         = __devexit_p(wlcore_remove),
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
        .id_table       = wl12xx_id_table,
 +#endif

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index ba1de036561f0ea2c09d22804676894294a2755d..fd1fa8782d5a266f273a7f3edc0cfbece4db5ec2 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -247,8 +247,10 @@ DRIVERS="$DRIVERS drivers/net/wireless/rtlwifi/rtl8192se"
 DRIVERS="$DRIVERS drivers/net/wireless/rtlwifi/rtl8192de"
 DRIVERS="$DRIVERS drivers/net/wireless/libertas_tf"
 DRIVERS="$DRIVERS drivers/net/wireless/ipw2x00"
-DRIVERS="$DRIVERS drivers/net/wireless/wl12xx"
-DRIVERS="$DRIVERS drivers/net/wireless/wl1251"
+DRIVERS="$DRIVERS drivers/net/wireless/ti"
+DRIVERS="$DRIVERS drivers/net/wireless/ti/wl12xx"
+DRIVERS="$DRIVERS drivers/net/wireless/ti/wl1251"
+DRIVERS="$DRIVERS drivers/net/wireless/ti/wlcore"
 DRIVERS="$DRIVERS drivers/net/wireless/iwmc3200wifi"
 DRIVERS="$DRIVERS drivers/net/wireless/orinoco"
 DRIVERS="$DRIVERS drivers/net/wireless/mwifiex"