[PATCH 1/7] compat-wireless: ath6kl: deactivate suspend/resume only for SDIO

[PATCH 1/7] compat-wireless: ath6kl: deactivate suspend/resume only for SDIO

[Hauke Mehrtens]

If ath6kl is used on a USB device suspend/resume should work, only on
SDIO based devices this causes some problems with older kernel versions.
---
 patches/29-sdio_no_suspend.patch |   84 +++++++-------------------------------
 1 file changed, 15 insertions(+), 69 deletions(-)

diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch
index e1a3f85..d7574d0 100644
--- a/patches/29-sdio_no_suspend.patch
+++ b/patches/29-sdio_no_suspend.patch
@@ -3,89 +3,35 @@ Starting with commit 66fceb69b72ff7e9cd8da2ca70033982d5376e0e
 libertas uses new functions from the in kernel sdio framework for
 suspend and resume that are not backported.
 
---- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
-+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
-@@ -2376,7 +2376,7 @@ int ath6kl_cfg80211_resume(struct ath6kl
- }
- EXPORT_SYMBOL(ath6kl_cfg80211_resume);
- 
--#ifdef CONFIG_PM
-+#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
- 
- /* hif layer decides what suspend mode to use */
- static int __ath6kl_cfg80211_suspend(struct wiphy *wiphy,
-@@ -3209,7 +3209,7 @@ static struct cfg80211_ops ath6kl_cfg802
- 	.del_pmksa = ath6kl_del_pmksa,
- 	.flush_pmksa = ath6kl_flush_pmksa,
- 	CFG80211_TESTMODE_CMD(ath6kl_tm_cmd)
--#ifdef CONFIG_PM
-+#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
- 	.suspend = __ath6kl_cfg80211_suspend,
- 	.resume = __ath6kl_cfg80211_resume,
- #endif
---- a/drivers/net/wireless/ath/ath6kl/hif-ops.h
-+++ b/drivers/net/wireless/ath/ath6kl/hif-ops.h
-@@ -84,6 +84,7 @@ static inline void ath6kl_hif_cleanup_sc
- 	return ar->hif_ops->cleanup_scatter(ar);
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
- static inline int ath6kl_hif_suspend(struct ath6kl *ar,
- 				     struct cfg80211_wowlan *wow)
- {
-@@ -91,6 +92,7 @@ static inline int ath6kl_hif_suspend(str
- 
- 	return ar->hif_ops->suspend(ar, wow);
- }
-+#endif
- 
- /*
-  * Read from the ATH6KL through its diagnostic window. No cooperation from
-@@ -122,12 +124,14 @@ static inline int ath6kl_hif_bmi_write(s
- 	return ar->hif_ops->bmi_write(ar, buf, len);
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
- static inline int ath6kl_hif_resume(struct ath6kl *ar)
- {
- 	ath6kl_dbg(ATH6KL_DBG_HIF, "hif resume\n");
- 
- 	return ar->hif_ops->resume(ar);
- }
-+#endif
- 
- static inline int ath6kl_hif_power_on(struct ath6kl *ar)
- {
 --- a/drivers/net/wireless/ath/ath6kl/sdio.c
 +++ b/drivers/net/wireless/ath/ath6kl/sdio.c
-@@ -836,6 +836,7 @@ static int ath6kl_set_sdio_pm_caps(struc
+@@ -807,6 +807,7 @@ out:
  	return ret;
  }
  
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
- static int ath6kl_sdio_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)
+ static int ath6kl_set_sdio_pm_caps(struct ath6kl *ar)
  {
  	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);
-@@ -953,6 +954,7 @@ static int ath6kl_sdio_resume(struct ath
+@@ -953,6 +954,17 @@ static int ath6kl_sdio_resume(struct ath
  
  	return 0;
  }
++#else
++static int ath6kl_sdio_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)
++{
++	return 0;
++}
++
++static int ath6kl_sdio_resume(struct ath6kl *ar)
++{
++	return 0;
++}
 +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */
  
  /* set the window address register (using 4-byte register access ). */
  static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr)
-@@ -1254,8 +1256,10 @@ static const struct ath6kl_hif_ops ath6k
- 	.enable_scatter = ath6kl_sdio_enable_scatter,
- 	.scat_req_rw = ath6kl_sdio_async_rw_scatter,
- 	.cleanup_scatter = ath6kl_sdio_cleanup_scatter,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
- 	.suspend = ath6kl_sdio_suspend,
- 	.resume = ath6kl_sdio_resume,
-+#endif
- 	.diag_read32 = ath6kl_sdio_diag_read32,
- 	.diag_write32 = ath6kl_sdio_diag_write32,
- 	.bmi_read = ath6kl_sdio_bmi_read,
-@@ -1265,7 +1269,7 @@ static const struct ath6kl_hif_ops ath6k
+@@ -1265,7 +1277,7 @@ static const struct ath6kl_hif_ops ath6k
  	.stop = ath6kl_sdio_stop,
  };
  
@@ -94,7 +40,7 @@ suspend and resume that are not backported.
  
  /*
   * Empty handlers so that mmc subsystem doesn't remove us entirely during
-@@ -1415,7 +1419,9 @@ static struct sdio_driver ath6kl_sdio_dr
+@@ -1415,7 +1427,9 @@ static struct sdio_driver ath6kl_sdio_dr
  	.id_table = ath6kl_sdio_devices,
  	.probe = ath6kl_sdio_probe,
  	.remove = ath6kl_sdio_remove,
-- 
1.7.9.5

[PATCH 2/7] compat-wireless: ti: fix some problems with the config options

[Hauke Mehrtens]

After the ti drivers where reorganized some config options in config.mk
where wrong. This patch corrects them.
---
 config.mk                              |   13 +++++--------
 patches/08-rename-config-options.patch |   11 -----------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/config.mk b/config.mk
index 22a8cf1..012a59f 100644
--- a/config.mk
+++ b/config.mk
@@ -545,7 +545,7 @@ ifndef CONFIG_COMPAT_KERNEL_2_6_25
 
 ifdef CONFIG_CRC7
 export CONFIG_WL1251_SPI=m
-export CONFIG_WL12XX_SPI=m
+export CONFIG_WLCORE_SPI=m
 endif #CONFIG_CRC7
 export CONFIG_P54_SPI=m
 
@@ -568,14 +568,8 @@ export CONFIG_B43_SDIO=y
 ifdef CONFIG_CRC7
 ifdef CONFIG_WL12XX_PLATFORM_DATA
 export CONFIG_COMPAT_WL1251_SDIO=m
+export CONFIG_WLCORE_SDIO=m
 endif #CONFIG_WL12XX_PLATFORM_DATA
-
-ifndef CONFIG_COMPAT_KERNEL_2_6_32
-ifdef CONFIG_WL12XX_PLATFORM_DATA
-export CONFIG_COMPAT_WLCORE_SDIO=m
-endif #CONFIG_WL12XX_PLATFORM_DATA
-endif #CONFIG_COMPAT_KERNEL_2_6_32
-
 endif #CONFIG_CRC7
 
 export CONFIG_MWIFIEX_SDIO=m
@@ -639,6 +633,9 @@ export CONFIG_ATH_COMMON=m
 export CONFIG_BRCMUTIL=m
 # export CONFIG_BRCMDBG=y
 
+export CONFIG_WL_TI=y
+export CONFIG_WLCORE=m
+
 ifdef CONFIG_CRC7
 export CONFIG_WL1251=m
 export CONFIG_WL12XX=m
diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index 52143d1..da63989 100644
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -90,17 +90,6 @@ 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/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/ti/wl1251/Makefile
 +++ b/drivers/net/wireless/ti/wl1251/Makefile
 @@ -5,6 +5,6 @@ wl1251_sdio-objs	+= sdio.o
-- 
1.7.9.5

[PATCH 3/7] compat-wireless: brcmfmac: add usb config option

[Hauke Mehrtens]

This activates the usb part of brcmfmac.
---
 config.mk |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/config.mk b/config.mk
index 012a59f..d2373b9 100644
--- a/config.mk
+++ b/config.mk
@@ -502,6 +502,8 @@ export CONFIG_COMPAT_USB_URB_THREAD_FIX=y
 export CONFIG_ATH9K_HTC=m
 # export CONFIG_ATH9K_HTC_DEBUGFS=y
 
+export CONFIG_BRCMFMAC_USB=y
+
 # RT2500USB does not require firmware
 export CONFIG_RT2500USB=m
 ifdef CONFIG_CRC_CCITT
@@ -591,10 +593,7 @@ export CONFIG_ATH6KL=m
 # export CONFIG_ATH6KL_DEBUG=y
 endif #CONFIG_COMPAT_KERNEL_2_6_27
 
-ifndef CONFIG_COMPAT_KERNEL_2_6_29
-export CONFIG_BRCMFMAC=m
 export CONFIG_BRCMFMAC_SDIO=y
-endif #CONFIG_COMPAT_KERNEL_2_6_29
 
 endif #CONFIG_MMC
 
@@ -633,6 +632,10 @@ export CONFIG_ATH_COMMON=m
 export CONFIG_BRCMUTIL=m
 # export CONFIG_BRCMDBG=y
 
+ifndef CONFIG_COMPAT_KERNEL_2_6_29
+export CONFIG_BRCMFMAC=m
+endif #CONFIG_COMPAT_KERNEL_2_6_29
+
 export CONFIG_WL_TI=y
 export CONFIG_WLCORE=m
 
-- 
1.7.9.5

[PATCH 4/7] compat-wireless: ath6kl: add config options for SDIO and USB

[Hauke Mehrtens]

ath6kl now supports USB and SDIO based devices, this patch adds the
config options for them.
---
 config.mk |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/config.mk b/config.mk
index d2373b9..a718257 100644
--- a/config.mk
+++ b/config.mk
@@ -265,6 +265,11 @@ export CONFIG_COMPAT_ATH9K_RATE_CONTROL=y
 
 export CONFIG_ATH9K_BTCOEX_SUPPORT=y
 
+ifndef CONFIG_COMPAT_KERNEL_2_6_27
+export CONFIG_ATH6KL=m
+# export CONFIG_ATH6KL_DEBUG=y
+endif #CONFIG_COMPAT_KERNEL_2_6_27
+
 # PCI Drivers
 ifdef CONFIG_PCI
 
@@ -502,6 +507,8 @@ export CONFIG_COMPAT_USB_URB_THREAD_FIX=y
 export CONFIG_ATH9K_HTC=m
 # export CONFIG_ATH9K_HTC_DEBUGFS=y
 
+export CONFIG_ATH6KL_USB=m
+
 export CONFIG_BRCMFMAC_USB=y
 
 # RT2500USB does not require firmware
@@ -588,10 +595,7 @@ export CONFIG_IWM=m
 export CONFIG_BT_HCIBTSDIO=m
 export CONFIG_BT_MRVL_SDIO=m
 
-ifndef CONFIG_COMPAT_KERNEL_2_6_27
-export CONFIG_ATH6KL=m
-# export CONFIG_ATH6KL_DEBUG=y
-endif #CONFIG_COMPAT_KERNEL_2_6_27
+export CONFIG_ATH6KL_SDIO=m
 
 export CONFIG_BRCMFMAC_SDIO=y
 
-- 
1.7.9.5

[PATCH 5/7] compat-wireless: deactivate CONFIG_BT_RFCOMM_TTY for old kernel versions.

[Hauke Mehrtens]

net/bluetooth/rfcomm/tty.c does not build on older kernel versions.
---
 config.mk                              |    4 +++-
 patches/08-rename-config-options.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/config.mk b/config.mk
index a718257..584189b 100644
--- a/config.mk
+++ b/config.mk
@@ -194,7 +194,9 @@ export CONFIG_LIB80211_CRYPT_TKIP=m
 
 export CONFIG_BT=m
 export CONFIG_BT_RFCOMM=m
-export CONFIG_BT_RFCOMM_TTY=y
+ifndef CONFIG_COMPAT_KERNEL_2_6_33
+export CONFIG_COMPAT_BT_RFCOMM_TTY=y
+endif #CONFIG_COMPAT_KERNEL_2_6_33
 export CONFIG_BT_BNEP=m
 export CONFIG_BT_BNEP_MC_FILTER=y
 export CONFIG_BT_BNEP_PROTO_FILTER=y
diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index da63989..bb24d7f 100644
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -133,3 +133,33 @@ CONFIG_BT_HIDP does not build with older kernel versions.
  int ath_rate_control_register(void);
  void ath_rate_control_unregister(void);
  #else
+--- a/net/bluetooth/rfcomm/Makefile
++++ b/net/bluetooth/rfcomm/Makefile
+@@ -5,4 +5,4 @@
+ obj-$(CONFIG_BT_RFCOMM) += rfcomm.o
+ 
+ rfcomm-y			:= core.o sock.o
+-rfcomm-$(CONFIG_BT_RFCOMM_TTY)	+= tty.o
++rfcomm-$(CONFIG_COMPAT_BT_RFCOMM_TTY)	+= tty.o
+--- a/include/net/bluetooth/rfcomm.h
++++ b/include/net/bluetooth/rfcomm.h
+@@ -357,7 +357,7 @@ struct rfcomm_dev_list_req {
+ 
+ int  rfcomm_dev_ioctl(struct sock *sk, unsigned int cmd, void __user *arg);
+ 
+-#ifdef CONFIG_BT_RFCOMM_TTY
++#ifdef CONFIG_COMPAT_BT_RFCOMM_TTY
+ int  rfcomm_init_ttys(void);
+ void rfcomm_cleanup_ttys(void);
+ #else
+--- a/net/bluetooth/rfcomm/sock.c
++++ b/net/bluetooth/rfcomm/sock.c
+@@ -873,7 +873,7 @@ static int rfcomm_sock_ioctl(struct sock
+ 	err = bt_sock_ioctl(sock, cmd, arg);
+ 
+ 	if (err == -ENOIOCTLCMD) {
+-#ifdef CONFIG_BT_RFCOMM_TTY
++#ifdef CONFIG_COMPAT_BT_RFCOMM_TTY
+ 		lock_sock(sk);
+ 		err = rfcomm_dev_ioctl(sk, cmd, (void __user *) arg);
+ 		release_sock(sk);
-- 
1.7.9.5

[PATCH 6/7] compat-wireless: build alx for kernel > 2.6.27

[Hauke Mehrtens]

When compiling against kernel <= 2.6.27 alx has build errors so use
atl1c there instead. The logic was wrong before.
---
 config.mk |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.mk b/config.mk
index 584189b..e8ee333 100644
--- a/config.mk
+++ b/config.mk
@@ -400,13 +400,13 @@ export CONFIG_MWL8K=m
 export CONFIG_ATL1=m
 export CONFIG_ATL2=m
 export CONFIG_ATL1E=m
-ifdef CONFIG_COMPAT_KERNEL_2_6_27
-export CONFIG_ATL1C=n
-export CONFIG_ALX=m
-else #CONFIG_COMPAT_KERNEL_2_6_27
+ifdef CONFIG_COMPAT_KERNEL_2_6_28
+export CONFIG_ATL1C=m
+export CONFIG_ALX=n
+else #CONFIG_COMPAT_KERNEL_2_6_28
 export CONFIG_ATL1C=n
 export CONFIG_ALX=m
-endif #CONFIG_COMPAT_KERNEL_2_6_27
+endif #CONFIG_COMPAT_KERNEL_2_6_28
 
 ifdef CONFIG_WIRELESS_EXT
 export CONFIG_HERMES=m
-- 
1.7.9.5

[PATCH 7/7] compat-wireless: add an extra include to ath6kl/htc_pipe.c

[Hauke Mehrtens]

---
 patches/06-header-changes.patch |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/patches/06-header-changes.patch b/patches/06-header-changes.patch
index c6a1d63..92ed02d 100644
--- a/patches/06-header-changes.patch
+++ b/patches/06-header-changes.patch
@@ -4,6 +4,19 @@ made. Some code gets shifted around between headers or
 new headers are defined. This patch deals with such
 cases.
 
+--- a/drivers/net/wireless/ath/ath6kl/htc_pipe.c
++++ b/drivers/net/wireless/ath/ath6kl/htc_pipe.c
+@@ -18,6 +18,10 @@
+ #include "debug.h"
+ #include "hif-ops.h"
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
++#include <asm/unaligned.h>
++#endif
++
+ #define HTC_PACKET_CONTAINER_ALLOCATION 32
+ #define HTC_CONTROL_BUFFER_SIZE (HTC_MAX_CTRL_MSG_LEN + HTC_HDR_LENGTH)
+ 
 --- a/drivers/net/wireless/b43/phy_common.h
 +++ b/drivers/net/wireless/b43/phy_common.h
 @@ -3,6 +3,9 @@
-- 
1.7.9.5