[PATCH] compat-wireless: make patches apply again.

[PATCH] compat-wireless: make patches apply again.

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/28-pm-qos-params.patch |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/patches/28-pm-qos-params.patch b/patches/28-pm-qos-params.patch
index cd8feca..e28d7a7 100644
--- a/patches/28-pm-qos-params.patch
+++ b/patches/28-pm-qos-params.patch
@@ -58,8 +58,8 @@ little wierd.
  	/* We have to signal any supplicant if we are disassociating */
  	if (associated)
 @@ -6669,8 +6686,16 @@ static int __init ipw2100_init(void)
- 	if (ret)
- 		goto out;
+ 	printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
+ 	printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT);
  
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
  	pm_qos_add_request(&ipw2100_pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
@@ -71,10 +71,10 @@ little wierd.
 +	pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100",
 +			       PM_QOS_DEFAULT_VALUE);
 +#endif
- #ifdef CONFIG_IPW2100_DEBUG
- 	ipw2100_debug_level = debug;
- 	ret = driver_create_file(&ipw2100_pci_driver.driver,
-@@ -6692,7 +6717,13 @@ static void __exit ipw2100_exit(void)
+ 
+ 	ret = pci_register_driver(&ipw2100_pci_driver);
+ 	if (ret)
+@@ -6697,7 +6722,13 @@ static void __exit ipw2100_exit(void)
  			   &driver_attr_debug_level);
  #endif
  	pci_unregister_driver(&ipw2100_pci_driver);
@@ -104,7 +104,7 @@ little wierd.
  					found->vif.bss_conf.beacon_int);
 --- a/net/mac80211/scan.c
 +++ b/net/mac80211/scan.c
-@@ -514,7 +514,11 @@ static int ieee80211_scan_state_decision
+@@ -500,7 +500,11 @@ static int ieee80211_scan_state_decision
  		bad_latency = time_after(jiffies +
  				ieee80211_scan_get_channel_time(next_chan),
  				local->leave_oper_channel_time +
-- 
1.7.0.4

Re: [PATCH] compat-wireless: make patches apply again.

[Luis R. Rodriguez]

On Sun, Aug 15, 2010 at 5:28 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Thanks, applied!

  Luis

Re: [PATCH] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Mon, Aug 13, 2012 at 12:41 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> Some parts of 11-dev-pm-ops.patch for iwlegacy went upstream in:
> commit 450e9038ee65e3246b2a942669fc79001466f9be
> Author: Johannes Berg <johannes.berg@intel.com>
> Date:   Tue Aug 7 21:46:44 2012 +0200
>
>     iwlegacy: clean up suspend/resume
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

applied and pushed, thanks!!

  Luis

[PATCH] compat-wireless: make patches apply again

[Hauke Mehrtens]

Some parts of 11-dev-pm-ops.patch for iwlegacy went upstream in:
commit 450e9038ee65e3246b2a942669fc79001466f9be
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Tue Aug 7 21:46:44 2012 +0200

    iwlegacy: clean up suspend/resume

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/11-dev-pm-ops.patch |   30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index 411b2d5..15af08c 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -9,7 +9,7 @@ calls on compat code with only slight modifications.
 
 --- a/drivers/bcma/host_pci.c
 +++ b/drivers/bcma/host_pci.c
-@@ -256,6 +256,9 @@ static int bcma_host_pci_resume(struct d
+@@ -257,6 +257,9 @@ static int bcma_host_pci_resume(struct d
  	return bcma_bus_resume(bus);
  }
  
@@ -19,7 +19,7 @@ calls on compat code with only slight modifications.
  static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend,
  			 bcma_host_pci_resume);
  #define BCMA_PM_OPS	(&bcma_pm_ops)
-@@ -283,7 +286,12 @@ static struct pci_driver bcma_pci_bridge
+@@ -284,7 +287,12 @@ static struct pci_driver bcma_pci_bridge
  	.id_table = bcma_pci_bridge_tbl,
  	.probe = bcma_host_pci_probe,
  	.remove = __devexit_p(bcma_host_pci_remove),
@@ -109,7 +109,7 @@ calls on compat code with only slight modifications.
  module_pci_driver(ath5k_pci_driver);
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -344,14 +344,10 @@ static int ath_pci_resume(struct device
+@@ -345,14 +345,10 @@ static int ath_pci_resume(struct device
  	return 0;
  }
  
@@ -128,7 +128,7 @@ calls on compat code with only slight modifications.
  
  #define ATH9K_PM_OPS	(&ath9k_pm_ops)
  
-@@ -369,7 +365,12 @@ static struct pci_driver ath_pci_driver
+@@ -370,7 +366,12 @@ static struct pci_driver ath_pci_driver
  	.id_table   = ath_pci_id_table,
  	.probe      = ath_pci_probe,
  	.remove     = ath_pci_remove,
@@ -173,22 +173,14 @@ calls on compat code with only slight modifications.
  static int __init
 --- a/drivers/net/wireless/iwlegacy/common.c
 +++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -4908,15 +4908,17 @@ il_pci_resume(struct device *device)
+@@ -4906,8 +4906,17 @@ il_pci_resume(struct device *device)
+ 	return 0;
  }
- EXPORT_SYMBOL(il_pci_resume);
- 
--const struct dev_pm_ops il_pm_ops = {
--	.suspend = il_pci_suspend,
--	.resume = il_pci_resume,
--	.freeze = il_pci_suspend,
--	.thaw = il_pci_resume,
--	.poweroff = il_pci_suspend,
--	.restore = il_pci_resume,
--};
+ 
 +compat_pci_suspend(il_pci_suspend)
 +compat_pci_resume(il_pci_resume)
 +
-+SIMPLE_DEV_PM_OPS(il_pm_ops, il_pci_suspend, il_pci_resume);
+ SIMPLE_DEV_PM_OPS(il_pm_ops, il_pci_suspend, il_pci_resume);
 +
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
  EXPORT_SYMBOL(il_pm_ops);
@@ -201,10 +193,10 @@ calls on compat code with only slight modifications.
  
 --- a/drivers/net/wireless/iwlegacy/common.h
 +++ b/drivers/net/wireless/iwlegacy/common.h
-@@ -1847,7 +1847,14 @@ __le32 il_add_beacon_time(struct il_priv
+@@ -1845,7 +1845,14 @@ __le32 il_add_beacon_time(struct il_priv
+ 			  u32 beacon_interval);
+ 
  #ifdef CONFIG_PM
- int il_pci_suspend(struct device *device);
- int il_pci_resume(struct device *device);
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
 +int il_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state);
 +int il_pci_resume_compat(struct pci_dev *pdev);
-- 
1.7.9.5

Re: [PATCH] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Thu, Oct 6, 2011 at 9:53 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Applied, and pushed, thanks!

   Luis

[PATCH] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/35-fix-makefile-includes.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/35-fix-makefile-includes.patch b/patches/35-fix-makefile-includes.patch
index 17994b7..c9f8eb1 100644
--- a/patches/35-fix-makefile-includes.patch
+++ b/patches/35-fix-makefile-includes.patch
@@ -20,8 +20,8 @@ path the make process will search in the kernel tree for the headers.
 +ccflags-y += -I$(obj)/..
 --- a/drivers/staging/brcm80211/brcmfmac/Makefile
 +++ b/drivers/staging/brcm80211/brcmfmac/Makefile
-@@ -18,8 +18,8 @@
- ccflags-$(CONFIG_BRCMDBG)	+= -DSHOW_EVENTS
+@@ -16,8 +16,8 @@
+ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
  ccflags-y += \
 -	-Idrivers/staging/brcm80211/brcmfmac	\
@@ -33,10 +33,10 @@ path the make process will search in the kernel tree for the headers.
  	wl_cfg80211.o \
 --- a/drivers/staging/brcm80211/brcmsmac/Makefile
 +++ b/drivers/staging/brcm80211/brcmsmac/Makefile
-@@ -16,9 +16,9 @@
- # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+@@ -17,9 +17,9 @@
  
- ccflags-y :=				\
+ ccflags-y := \
+ 	-D__CHECK_ENDIAN__ \
 -	-Idrivers/staging/brcm80211/brcmsmac \
 -	-Idrivers/staging/brcm80211/brcmsmac/phy \
 -	-Idrivers/staging/brcm80211/include
-- 
1.7.4.1

Re: [PATCH] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Sat, Oct 1, 2011 at 3:33 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Applied and pushed, thanks!

  Luis

[PATCH] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/06-header-changes.patch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/06-header-changes.patch b/patches/06-header-changes.patch
index 9a2041f..d90fb06 100644
--- a/patches/06-header-changes.patch
+++ b/patches/06-header-changes.patch
@@ -23,9 +23,9 @@ cases.
  
  #include <linux/ip.h>
 +#include <linux/in.h>
+ #include <linux/module.h>
  #include "wifi.h"
  #include "rc.h"
- #include "base.h"
 --- a/drivers/net/wireless/wl1251/main.c
 +++ b/drivers/net/wireless/wl1251/main.c
 @@ -24,6 +24,9 @@
@@ -52,7 +52,7 @@ cases.
  
 --- a/net/mac80211/key.c
 +++ b/net/mac80211/key.c
-@@ -22,6 +22,9 @@
+@@ -23,6 +23,9 @@
  #include "aes_ccm.h"
  #include "aes_cmac.h"
  
-- 
1.7.4.1

[PATCH] compat-wireless: make patches apply again.

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/08-rename-config-options.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index 5505018..605e477 100644
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -122,15 +122,15 @@ CONFIG_BT_HIDP does not build with older kernel versions.
  hidp-objs := core.o sock.o
 --- a/drivers/net/wireless/wl12xx/Makefile
 +++ b/drivers/net/wireless/wl12xx/Makefile
-@@ -8,9 +8,9 @@ wl12xx_sdio_test-objs = sdio_test.o
+@@ -8,9 +8,9 @@ wl12xx_sdio_test-objs	= sdio_test.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
  
--obj-$(CONFIG_WL12XX_SDIO_TEST)	+= wl12xx_sdio_test.o
-+obj-$(CONFIG_COMPAT_WL12XX_SDIO_TEST)	+= wl12xx_sdio_test.o
+-obj-$(CONFIG_WL12XX_SDIO_TEST)		+= wl12xx_sdio_test.o
++obj-$(CONFIG_COMPAT_WL12XX_SDIO_TEST)		+= wl12xx_sdio_test.o
  
  # small builtin driver bit
  obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx_platform_data.o
-- 
1.7.4.1

[PATCH] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/29-sdio_no_suspend.patch |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch
index 843e617..ef14f08 100644
--- a/patches/29-sdio_no_suspend.patch
+++ b/patches/29-sdio_no_suspend.patch
@@ -86,7 +86,7 @@ suspend and resume that are not backported.
  
 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
 +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
-@@ -127,7 +127,7 @@ static int brcmf_ops_sdio_probe(struct s
+@@ -49,7 +49,7 @@ static int brcmf_ops_sdio_probe(struct s
  				const struct sdio_device_id *id);
  static void brcmf_ops_sdio_remove(struct sdio_func *func);
  
@@ -95,30 +95,30 @@ suspend and resume that are not backported.
  static int brcmf_sdio_suspend(struct device *dev);
  static int brcmf_sdio_resume(struct device *dev);
  #endif /* CONFIG_PM */
-@@ -157,7 +157,7 @@ static const struct sdio_device_id brcmf
+@@ -62,7 +62,7 @@ static const struct sdio_device_id brcmf
  	{ /* end: all zeroes */ },
  };
  
--#ifdef CONFIG_PM
-+#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+-#ifdef CONFIG_PM_SLEEP
++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
  static const struct dev_pm_ops brcmf_sdio_pm_ops = {
  	.suspend	= brcmf_sdio_suspend,
  	.resume		= brcmf_sdio_resume,
-@@ -169,7 +169,7 @@ static struct sdio_driver brcmf_sdmmc_dr
+@@ -74,7 +74,7 @@ static struct sdio_driver brcmf_sdmmc_dr
  	.remove = brcmf_ops_sdio_remove,
  	.name = "brcmfmac",
  	.id_table = brcmf_sdmmc_ids,
--#ifdef CONFIG_PM
-+#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+-#ifdef CONFIG_PM_SLEEP
++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
  	.drv = {
  		.pm = &brcmf_sdio_pm_ops,
  	},
-@@ -1081,7 +1081,7 @@ static void brcmf_ops_sdio_remove(struct
+@@ -640,7 +640,7 @@ static void brcmf_ops_sdio_remove(struct
  }
  
  
--#ifdef CONFIG_PM
-+#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+-#ifdef CONFIG_PM_SLEEP
++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
  static int brcmf_sdio_suspend(struct device *dev)
  {
  	mmc_pm_flag_t sdio_flags;
-- 
1.7.4.1

Re: [PATCH] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Tue, Aug 2, 2011 at 2:15 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Thanks so much, applied all and pushed.

  Luis

[PATCH] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/01-netdev.patch |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index 244e03e..c0e938c 100644
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -45,10 +45,10 @@ without creating a headache on maintenance of the pathes.
  	retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp,
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -698,7 +698,12 @@ static const struct net_device_ops ieee8
- static void ieee80211_if_setup(struct net_device *dev)
+@@ -699,7 +699,12 @@ static void ieee80211_if_setup(struct ne
  {
  	ether_setup(dev);
+ 	dev->priv_flags &= ~IFF_TX_SKB_SHARING;
 -	dev->netdev_ops = &ieee80211_dataif_ops;
 +	netdev_attach_ops(dev, &ieee80211_dataif_ops);
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
@@ -59,7 +59,7 @@ without creating a headache on maintenance of the pathes.
  	dev->destructor = free_netdev;
  }
  
-@@ -845,7 +850,7 @@ static void ieee80211_setup_sdata(struct
+@@ -846,7 +851,7 @@ static void ieee80211_setup_sdata(struct
  	/* and set some type-dependent values */
  	sdata->vif.type = type;
  	sdata->vif.p2p = false;
@@ -68,7 +68,7 @@ without creating a headache on maintenance of the pathes.
  	sdata->wdev.iftype = type;
  
  	sdata->control_port_protocol = cpu_to_be16(ETH_P_PAE);
-@@ -884,7 +889,7 @@ static void ieee80211_setup_sdata(struct
+@@ -885,7 +890,7 @@ static void ieee80211_setup_sdata(struct
  		break;
  	case NL80211_IFTYPE_MONITOR:
  		sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -77,7 +77,7 @@ without creating a headache on maintenance of the pathes.
  		sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
  				      MONITOR_FLAG_OTHER_BSS;
  		break;
-@@ -1135,6 +1140,8 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1136,6 +1141,8 @@ int ieee80211_if_add(struct ieee80211_lo
  		return -ENOMEM;
  	dev_net_set(ndev, wiphy_net(local->hw.wiphy));
  
@@ -86,7 +86,7 @@ without creating a headache on maintenance of the pathes.
  	ndev->needed_headroom = local->tx_headroom +
  				4*6 /* four MAC addresses */
  				+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1143,6 +1150,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1144,6 +1151,7 @@ int ieee80211_if_add(struct ieee80211_lo
  				- ETH_HLEN /* ethernet hard_header_len */
  				+ IEEE80211_ENCRYPT_HEADROOM;
  	ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
@@ -314,10 +314,10 @@ without creating a headache on maintenance of the pathes.
  {
  	struct bnep_session *s = netdev_priv(dev);
  	struct sock *sk = s->sock->sk;
-@@ -231,7 +235,7 @@ void bnep_net_setup(struct net_device *d
- 	dev->addr_len = ETH_ALEN;
+@@ -232,7 +236,7 @@ void bnep_net_setup(struct net_device *d
  
  	ether_setup(dev);
+ 	dev->priv_flags &= ~IFF_TX_SKB_SHARING;
 -	dev->netdev_ops = &bnep_netdev_ops;
 +	netdev_attach_ops(dev, &bnep_netdev_ops);
  
-- 
1.7.4.1

Re: [PATCH] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Tue, Jun 21, 2011 at 8:25 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

applied and pushed, thanks!

 Luis

[PATCH] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/11-dev-pm-ops.patch       |   59 +++++++++++++-----------------------
 patches/99-change-makefiles.patch |    3 +-
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index acf2dc8..b36c48b 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -84,7 +84,7 @@ calls on compat code with only slight modifications.
  /*
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -316,14 +316,11 @@ static int ath_pci_resume(struct device
+@@ -316,14 +316,10 @@ static int ath_pci_resume(struct device
  	return 0;
  }
  
@@ -96,7 +96,6 @@ calls on compat code with only slight modifications.
 -	.poweroff = ath_pci_suspend,
 -	.restore = ath_pci_resume,
 -};
-+
 +compat_pci_suspend(ath_pci_suspend)
 +compat_pci_resume(ath_pci_resume)
 +
@@ -104,7 +103,7 @@ calls on compat code with only slight modifications.
  
  #define ATH9K_PM_OPS	(&ath9k_pm_ops)
  
-@@ -341,7 +338,12 @@ static struct pci_driver ath_pci_driver
+@@ -341,7 +337,12 @@ static struct pci_driver ath_pci_driver
  	.id_table   = ath_pci_id_table,
  	.probe      = ath_pci_probe,
  	.remove     = ath_pci_remove,
@@ -218,28 +217,13 @@ calls on compat code with only slight modifications.
  };
  
  static int __init iwl4965_init(void)
---- a/drivers/net/wireless/iwlwifi/iwl-agn.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
-@@ -4001,7 +4001,12 @@ static struct pci_driver iwl_driver = {
- 	.id_table = iwl_hw_card_ids,
- 	.probe = iwl_pci_probe,
- 	.remove = __devexit_p(iwl_pci_remove),
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
- 	.driver.pm = IWL_PM_OPS,
-+#elif defined(CONFIG_PM)
-+	.suspend = iwl_pci_suspend_compat,
-+	.resume = iwl_pci_resume_compat,
-+#endif
- };
- 
- static int __init iwl_init(void)
---- a/drivers/net/wireless/iwlwifi/iwl-core.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
-@@ -2014,13 +2014,9 @@ int iwl_pci_resume(struct device *device
- 	return 0;
+--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
++++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
+@@ -530,14 +530,10 @@ static int iwl_pci_resume(struct device
+ 	return iwl_resume(priv);
  }
  
--const struct dev_pm_ops iwl_pm_ops = {
+-static const struct dev_pm_ops iwl_dev_pm_ops = {
 -	.suspend = iwl_pci_suspend,
 -	.resume = iwl_pci_resume,
 -	.freeze = iwl_pci_suspend,
@@ -247,24 +231,23 @@ calls on compat code with only slight modifications.
 -	.poweroff = iwl_pci_suspend,
 -	.restore = iwl_pci_resume,
 -};
-+const SIMPLE_DEV_PM_OPS(iwl_pm_ops, iwl_pci_suspend, iwl_pci_resume);
++const SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
 +
 +compat_pci_suspend(iwl_pci_suspend)
 +compat_pci_resume(iwl_pci_resume)
  
- #endif /* CONFIG_PM */
---- a/drivers/net/wireless/iwlwifi/iwl-core.h
-+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
-@@ -502,7 +502,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr
- #ifdef CONFIG_PM
- int iwl_pci_suspend(struct device *device);
- int iwl_pci_resume(struct device *device);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-+int iwl_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state);
-+int iwl_pci_resume_compat(struct pci_dev *pdev);
-+#else
- extern const struct dev_pm_ops iwl_pm_ops;
-+#endif
+ #define IWL_PM_OPS	(&iwl_dev_pm_ops)
  
- #define IWL_PM_OPS	(&iwl_pm_ops)
+@@ -552,7 +548,12 @@ static struct pci_driver iwl_pci_driver
+ 	.id_table = iwl_hw_card_ids,
+ 	.probe = iwl_pci_probe,
+ 	.remove = __devexit_p(iwl_pci_remove),
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
+ 	.driver.pm = IWL_PM_OPS,
++#elif defined(CONFIG_PM)
++	.suspend = iwl_pci_suspend_compat,
++	.resume = iwl_pci_resume_compat,
++#endif
+ };
  
+ int __must_check iwl_pci_register_driver(void)
diff --git a/patches/99-change-makefiles.patch b/patches/99-change-makefiles.patch
index be62e28..2d5af48 100644
--- a/patches/99-change-makefiles.patch
+++ b/patches/99-change-makefiles.patch
@@ -13,7 +13,7 @@ only the wireless stuff.
  obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
 --- a/drivers/net/usb/Makefile
 +++ b/drivers/net/usb/Makefile
-@@ -2,30 +2,7 @@
+@@ -2,31 +2,7 @@
  # Makefile for USB Network drivers
  #
  
@@ -38,6 +38,7 @@ only the wireless stuff.
  obj-$(CONFIG_USB_COMPAT_USBNET)	+= usbnet.o
 -obj-$(CONFIG_USB_NET_INT51X1)	+= int51x1.o
 -obj-$(CONFIG_USB_CDC_PHONET)	+= cdc-phonet.o
+-obj-$(CONFIG_USB_NET_KALMIA)	+= kalmia.o
 -obj-$(CONFIG_USB_IPHETH)	+= ipheth.o
 -obj-$(CONFIG_USB_SIERRA_NET)	+= sierra_net.o
 -obj-$(CONFIG_USB_NET_CX82310_ETH)	+= cx82310_eth.o
-- 
1.7.4.1

Re: [PATCH] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Wed, May 11, 2011 at 10:09 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Thanks, applied and pushed!

 Luis

[PATCH] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/35-fix-makefile-includes.patch |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/patches/35-fix-makefile-includes.patch b/patches/35-fix-makefile-includes.patch
index ea5b41d..7d1ceaf 100644
--- a/patches/35-fix-makefile-includes.patch
+++ b/patches/35-fix-makefile-includes.patch
@@ -20,32 +20,28 @@ path the make process will search in the kernel tree for the headers.
 +ccflags-y += -I$(obj)/..
 --- a/drivers/staging/brcm80211/brcmfmac/Makefile
 +++ b/drivers/staging/brcm80211/brcmfmac/Makefile
-@@ -35,9 +35,9 @@ ccflags-y :=			\
+@@ -35,8 +35,8 @@ ccflags-y :=			\
  ccflags-$(CONFIG_BRCMDBG)	+= -DDHD_DEBUG
  
  ccflags-y += \
 -	-Idrivers/staging/brcm80211/brcmfmac	\
--	-Idrivers/staging/brcm80211/include		\
--	-Idrivers/staging/brcm80211/util
+-	-Idrivers/staging/brcm80211/include
 +	-I$(obj)		\
-+	-I$(obj)/../include	\
-+	-I$(obj)/../util
++	-I$(obj)/../include
  
  DHDOFILES = \
  	wl_cfg80211.o \
 --- a/drivers/staging/brcm80211/brcmsmac/Makefile
 +++ b/drivers/staging/brcm80211/brcmsmac/Makefile
-@@ -23,10 +23,10 @@ ccflags-y :=				\
+@@ -23,9 +23,9 @@ ccflags-y :=				\
  	-DWL11N					\
  	-DDBAND					\
  	-DBCMNVRAMR				\
 -	-Idrivers/staging/brcm80211/brcmsmac \
 -	-Idrivers/staging/brcm80211/brcmsmac/phy \
--	-Idrivers/staging/brcm80211/util \
 -	-Idrivers/staging/brcm80211/include
 +	-I$(obj)				\
 +	-I$(obj)/phy				\
-+	-I$(obj)/../util			\
 +	-I$(obj)/../include
  
  BRCMSMAC_OFILES := \
-- 
1.7.4.1

Re: [PATCH] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Wed, Dec 8, 2010 at 4:15 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> uninit is already set in netdev_attach_ops so it is not needed an extra time.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Applied and pushed, thanks!

  Luis

[PATCH] compat-wireless: make patches apply again

[Hauke Mehrtens]

uninit is already set in netdev_attach_ops so it is not needed an extra time.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/01-netdev.patch           |   23 ++++++-----------------
 patches/99-change-makefiles.patch |    5 +++--
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index c1833e3..fd0139e 100644
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -23,7 +23,7 @@ without creating a headache on maintenance of the pathes.
  	if (unlikely(retval < 0)) {
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1343,7 +1343,7 @@ usbnet_probe (struct usb_interface *udev
+@@ -1360,7 +1360,7 @@ usbnet_probe (struct usb_interface *udev
  		net->features |= NETIF_F_HIGHDMA;
  #endif
  
@@ -45,7 +45,7 @@ without creating a headache on maintenance of the pathes.
  	retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp,
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -711,7 +711,12 @@ static const struct net_device_ops ieee8
+@@ -689,7 +689,12 @@ static const struct net_device_ops ieee8
  static void ieee80211_if_setup(struct net_device *dev)
  {
  	ether_setup(dev);
@@ -59,7 +59,7 @@ without creating a headache on maintenance of the pathes.
  	dev->destructor = free_netdev;
  }
  
-@@ -858,7 +863,7 @@ static void ieee80211_setup_sdata(struct
+@@ -836,7 +841,7 @@ static void ieee80211_setup_sdata(struct
  	/* and set some type-dependent values */
  	sdata->vif.type = type;
  	sdata->vif.p2p = false;
@@ -68,7 +68,7 @@ without creating a headache on maintenance of the pathes.
  	sdata->wdev.iftype = type;
  
  	sdata->control_port_protocol = cpu_to_be16(ETH_P_PAE);
-@@ -897,7 +902,7 @@ static void ieee80211_setup_sdata(struct
+@@ -875,7 +880,7 @@ static void ieee80211_setup_sdata(struct
  		break;
  	case NL80211_IFTYPE_MONITOR:
  		sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -77,7 +77,7 @@ without creating a headache on maintenance of the pathes.
  		sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
  				      MONITOR_FLAG_OTHER_BSS;
  		break;
-@@ -1148,6 +1153,8 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1126,6 +1131,8 @@ int ieee80211_if_add(struct ieee80211_lo
  		return -ENOMEM;
  	dev_net_set(ndev, wiphy_net(local->hw.wiphy));
  
@@ -86,7 +86,7 @@ without creating a headache on maintenance of the pathes.
  	ndev->needed_headroom = local->tx_headroom +
  				4*6 /* four MAC addresses */
  				+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1156,6 +1163,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1134,6 +1141,7 @@ int ieee80211_if_add(struct ieee80211_lo
  				- ETH_HLEN /* ethernet hard_header_len */
  				+ IEEE80211_ENCRYPT_HEADROOM;
  	ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
@@ -94,17 +94,6 @@ without creating a headache on maintenance of the pathes.
  
  	ret = dev_alloc_name(ndev, ndev->name);
  	if (ret < 0)
-@@ -1204,6 +1212,10 @@ int ieee80211_if_add(struct ieee80211_lo
- 	if (ret)
- 		goto fail;
- 
-+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,28))
-+	ndev->uninit = ieee80211_teardown_sdata;
-+#endif
-+
- 	if (ieee80211_vif_is_mesh(&sdata->vif) &&
- 	    params && params->mesh_id_len)
- 		ieee80211_sdata_set_mesh_id(sdata,
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
 @@ -2163,7 +2163,7 @@ static int __devinit b44_init_one(struct
diff --git a/patches/99-change-makefiles.patch b/patches/99-change-makefiles.patch
index c75f4f2..5114869 100644
--- a/patches/99-change-makefiles.patch
+++ b/patches/99-change-makefiles.patch
@@ -13,7 +13,7 @@ only the wireless stuff.
  obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
 --- a/drivers/net/usb/Makefile
 +++ b/drivers/net/usb/Makefile
-@@ -2,28 +2,7 @@
+@@ -2,29 +2,7 @@
  # Makefile for USB Network drivers
  #
  
@@ -41,6 +41,7 @@ only the wireless stuff.
 -obj-$(CONFIG_USB_IPHETH)	+= ipheth.o
 -obj-$(CONFIG_USB_SIERRA_NET)	+= sierra_net.o
 -obj-$(CONFIG_USB_NET_CX82310_ETH)	+= cx82310_eth.o
+-obj-$(CONFIG_USB_NET_CDC_NCM)	+= cdc_ncm.o
  
 --- a/drivers/net/wireless/Makefile
 +++ b/drivers/net/wireless/Makefile
@@ -88,5 +89,5 @@ only the wireless stuff.
 -obj-$(CONFIG_WEXT_PRIV) += wext-priv.o
 -
  cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
- cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o
+ cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o
  cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o
-- 
1.7.1

Re: [PATCH] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Wed, Dec 1, 2010 at 7:04 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Applied this and your compat patches too, thanks!

  Luis

[PATCH] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 crap/0002-ath9k-Add-pktlog-support.patch |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch
index 78b2820..96ffc10 100644
--- a/crap/0002-ath9k-Add-pktlog-support.patch
+++ b/crap/0002-ath9k-Add-pktlog-support.patch
@@ -97,7 +97,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	return 0;
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -24,6 +24,7 @@
+@@ -25,6 +25,7 @@
  
  #include "debug.h"
  #include "common.h"
@@ -105,15 +105,15 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  /*
   * Header for the ath9k.ko driver core *only* -- hw code nor any other driver
-@@ -544,6 +545,7 @@ struct ath_ant_comb {
- #define SC_OP_BT_PRIORITY_DETECTED   BIT(12)
+@@ -546,6 +547,7 @@ struct ath_ant_comb {
  #define SC_OP_BT_SCAN		     BIT(13)
  #define SC_OP_ANI_RUN		     BIT(14)
-+#define SC_OP_PKTLOGGING	     BIT(15)
+ #define SC_OP_ENABLE_APM	     BIT(15)
++#define SC_OP_PKTLOGGING	     BIT(16)
  
  /* Powersave flags */
  #define PS_WAIT_FOR_BEACON        BIT(0)
-@@ -621,6 +623,10 @@ struct ath_softc {
+@@ -623,6 +625,10 @@ struct ath_softc {
  #ifdef CONFIG_ATH9K_DEBUGFS
  	struct ath9k_debug debug;
  #endif
@@ -161,7 +161,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds,
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2142,7 +2142,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
+@@ -2147,7 +2147,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
  		phybits |= AR_PHY_ERR_RADAR;
  	if (bits & ATH9K_RX_FILTER_PHYERR)
  		phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING;
@@ -172,7 +172,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		REG_WRITE(ah, AR_RXCFG,
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -616,7 +616,7 @@ struct ath_hw_ops {
+@@ -617,7 +617,7 @@ struct ath_hw_ops {
  			    const void *ds0, dma_addr_t buf_addr,
  			    unsigned int qcu);
  	int (*proc_txdesc)(struct ath_hw *ah, void *ds,
@@ -181,7 +181,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	void (*set11n_txdesc)(struct ath_hw *ah, void *ds,
  			      u32 pktLen, enum ath9k_pkt_type type,
  			      u32 txPower, u32 keyIx,
-@@ -845,6 +845,8 @@ struct ath_hw {
+@@ -846,6 +846,8 @@ struct ath_hw {
  
  	/* Enterprise mode cap */
  	u32 ent_mode;
@@ -1310,7 +1310,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	if (conf_is_ht(&sc->hw->conf) &&
 --- a/drivers/net/wireless/ath/ath9k/recv.c
 +++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -1617,6 +1617,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1619,6 +1619,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
  	struct ieee80211_rx_status *rxs;
  	struct ath_hw *ah = sc->sc_ah;
  	struct ath_common *common = ath9k_hw_common(ah);
@@ -1318,7 +1318,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	/*
  	 * The hw can techncically differ from common->hw when using ath9k
  	 * virtual wiphy so to account for that we iterate over the active
-@@ -1709,12 +1710,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1711,12 +1712,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
  				 dma_type);
  
  		skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);
@@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		if (!txpending || (tid->state & AGGR_CLEANUP)) {
  			/*
  			 * complete the acked-ones/xretried ones; update
-@@ -2006,7 +2008,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2025,7 +2027,7 @@ static void ath_tx_processq(struct ath_s
  		ds = lastbf->bf_desc;
  
  		memset(&ts, 0, sizeof(ts));
@@ -1364,7 +1364,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		if (status == -EINPROGRESS) {
  			spin_unlock_bh(&txq->axq_lock);
  			break;
-@@ -2045,11 +2047,15 @@ static void ath_tx_processq(struct ath_s
+@@ -2064,11 +2066,15 @@ static void ath_tx_processq(struct ath_s
  
  		qnum = skb_get_queue_mapping(bf->bf_mpdu);
  
@@ -1382,7 +1382,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  		if (txq == sc->tx.txq_map[qnum])
  			ath_wake_mac80211_queue(sc, qnum);
-@@ -2123,9 +2129,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2142,9 +2148,11 @@ void ath_tx_edma_tasklet(struct ath_soft
  	int status;
  	int txok;
  	int qnum;
@@ -1395,7 +1395,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		if (status == -EINPROGRESS)
  			break;
  		if (status == -EIO) {
-@@ -2168,16 +2176,20 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2187,16 +2195,20 @@ void ath_tx_edma_tasklet(struct ath_soft
  
  		qnum = skb_get_queue_mapping(bf->bf_mpdu);
  
-- 
1.7.1

Re: [PATCH] compat-wireless: make patches apply again

[Luis R. Rodriguez]

On Wed, Nov 17, 2010 at 1:52 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Applied and pushed, thanks!

  Luis

[PATCH] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 crap/0002-ath9k-Add-pktlog-support.patch |   34 +++++++++++++++--------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch
index 89b0074..775be74 100644
--- a/crap/0002-ath9k-Add-pktlog-support.patch
+++ b/crap/0002-ath9k-Add-pktlog-support.patch
@@ -105,7 +105,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  /*
   * Header for the ath9k.ko driver core *only* -- hw code nor any other driver
-@@ -559,6 +560,7 @@ struct ath_ant_comb {
+@@ -544,6 +545,7 @@ struct ath_ant_comb {
  #define SC_OP_BT_PRIORITY_DETECTED   BIT(12)
  #define SC_OP_BT_SCAN		     BIT(13)
  #define SC_OP_ANI_RUN		     BIT(14)
@@ -113,7 +113,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  /* Powersave flags */
  #define PS_WAIT_FOR_BEACON        BIT(0)
-@@ -635,6 +637,10 @@ struct ath_softc {
+@@ -621,6 +623,10 @@ struct ath_softc {
  #ifdef CONFIG_ATH9K_DEBUGFS
  	struct ath9k_debug debug;
  #endif
@@ -161,7 +161,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds,
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2140,7 +2140,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
+@@ -2143,7 +2143,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
  		phybits |= AR_PHY_ERR_RADAR;
  	if (bits & ATH9K_RX_FILTER_PHYERR)
  		phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING;
@@ -172,7 +172,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		REG_WRITE(ah, AR_RXCFG,
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -580,7 +580,7 @@ struct ath_hw_ops {
+@@ -616,7 +616,7 @@ struct ath_hw_ops {
  			    const void *ds0, dma_addr_t buf_addr,
  			    unsigned int qcu);
  	int (*proc_txdesc)(struct ath_hw *ah, void *ds,
@@ -181,10 +181,10 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	void (*set11n_txdesc)(struct ath_hw *ah, void *ds,
  			      u32 pktLen, enum ath9k_pkt_type type,
  			      u32 txPower, u32 keyIx,
-@@ -804,6 +804,8 @@ struct ath_hw {
- 	 * this register when in sleep states.
- 	 */
- 	u32 WARegVal;
+@@ -845,6 +845,8 @@ struct ath_hw {
+ 
+ 	/* Enterprise mode cap */
+ 	u32 ent_mode;
 +
 +	bool is_pkt_logging;
  };
@@ -1298,7 +1298,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  }
  
  static const
-@@ -1374,7 +1381,8 @@ static void ath_tx_status(void *priv, st
+@@ -1358,7 +1365,8 @@ static void ath_tx_status(void *priv, st
  		tx_status = 1;
  
  	ath_rc_tx_status(sc, ath_rc_priv, tx_info, final_ts_idx, tx_status,
@@ -1346,7 +1346,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data,
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -436,6 +436,8 @@ static void ath_tx_complete_aggr(struct
+@@ -476,6 +476,8 @@ static void ath_tx_complete_aggr(struct
  			list_move_tail(&bf->list, &bf_head);
  		}
  
@@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		if (!txpending || (tid->state & AGGR_CLEANUP)) {
  			/*
  			 * complete the acked-ones/xretried ones; update
-@@ -2069,7 +2071,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2004,7 +2006,7 @@ static void ath_tx_processq(struct ath_s
  		ds = lastbf->bf_desc;
  
  		memset(&ts, 0, sizeof(ts));
@@ -1364,13 +1364,14 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		if (status == -EINPROGRESS) {
  			spin_unlock_bh(&txq->axq_lock);
  			break;
-@@ -2108,10 +2110,14 @@ static void ath_tx_processq(struct ath_s
+@@ -2043,11 +2045,15 @@ static void ath_tx_processq(struct ath_s
  
  		qnum = skb_get_queue_mapping(bf->bf_mpdu);
  
 -		if (bf_isampdu(bf))
 +		if (bf_isampdu(bf)) {
- 			ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, txok);
+ 			ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, txok,
+ 					     true);
 -		else
 +		} else {
 +			ath9k_pktlog_txctrl(sc, &bf_head, lastbf);
@@ -1381,7 +1382,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  		if (txq == sc->tx.txq_map[qnum])
  			ath_wake_mac80211_queue(sc, qnum);
-@@ -2185,9 +2191,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2121,9 +2127,11 @@ void ath_tx_edma_tasklet(struct ath_soft
  	int status;
  	int txok;
  	int qnum;
@@ -1394,13 +1395,14 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  		if (status == -EINPROGRESS)
  			break;
  		if (status == -EIO) {
-@@ -2230,15 +2238,19 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2166,16 +2174,20 @@ void ath_tx_edma_tasklet(struct ath_soft
  
  		qnum = skb_get_queue_mapping(bf->bf_mpdu);
  
 -		if (bf_isampdu(bf))
 +		if (bf_isampdu(bf)) {
- 			ath_tx_complete_aggr(sc, txq, bf, &bf_head, &txs, txok);
+ 			ath_tx_complete_aggr(sc, txq, bf, &bf_head, &txs,
+ 					     txok, true);
 -		else
 +		} else {
 +			ath9k_pktlog_txctrl(sc, &bf_head, lastbf);
-- 
1.7.1