[PATCH 0/4] *** SUBJECT HERE ***

[PATCH 0/4] *** SUBJECT HERE ***

[Hauke Mehrtens]

Some patches for compat-wireless
For kernel 2.6.26 and older debugfs_remove_recursive needs to be
backported. The problems with rt2800lib will be fixed in
wireless-testing.

Hauke Mehrtens (4):
  Fix build problem, missing get_unaligned_le16
  Fix two warnings
  refresh patches
  [compat-2.6] Add symbol CONFIG_RT2800_LIB

 compat/patches/01-netdev.patch                  |    2 +-
 compat/patches/06-header-changes.patch          |   12 ++++++++++++
 compat/patches/08-rename-iwl4965-config.patch   |    2 +-
 compat/patches/09-threaded-irq.patch            |    2 +-
 compat/patches/11-dev-pm-ops.patch              |    2 +-
 compat/patches/15-symbol-export-conflicts.patch |    2 +-
 config.mk                                       |    6 +++---
 7 files changed, 20 insertions(+), 8 deletions(-)

[PATCH 1/4] Fix build problem, missing get_unaligned_le16

[Hauke Mehrtens]

This patch fixes the "implicit declaration of function
'get_unaligned_le16'" in drivers/net/wireless/libertas/assoc.c

CC: philipp_subx@redfish-solutions.com
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 compat/patches/06-header-changes.patch |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/compat/patches/06-header-changes.patch b/compat/patches/06-header-changes.patch
index ee0be7f..14e544a 100644
--- a/compat/patches/06-header-changes.patch
+++ b/compat/patches/06-header-changes.patch
@@ -16,6 +16,18 @@ cases.
  
  struct b43_wldev;
  
+--- a/drivers/net/wireless/libertas/assoc.c
++++ b/drivers/net/wireless/libertas/assoc.c
+@@ -5,6 +5,9 @@
+ #include <linux/ieee80211.h>
+ #include <linux/if_arp.h>
+ #include <net/lib80211.h>
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
++#include <asm/unaligned.h>
++#endif
+ 
+ #include "assoc.h"
+ #include "decl.h"
 --- a/drivers/net/wireless/wl12xx/wl1251_main.c	2009-08-07 11:42:12.532495607 -0700
 +++ b/drivers/net/wireless/wl12xx/wl1251_main.c	2009-08-07 12:08:31.167548696 -0700
 @@ -26,6 +26,9 @@
-- 
1.6.3.3

[PATCH 2/4] Fix two warnings

[Hauke Mehrtens]

This fixes these two warnings:
drivers/net/wireless/ath/ath5k/base.c:202: warning: ‘ath5k_pci_suspend_compat’ defined but not used
drivers/net/wireless/ath/ath5k/base.c:216: warning: ‘ath5k_pci_resume_compat’ defined but not used

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

diff --git a/compat/patches/11-dev-pm-ops.patch b/compat/patches/11-dev-pm-ops.patch
index a1937a9..fc4de8f 100644
--- a/compat/patches/11-dev-pm-ops.patch
+++ b/compat/patches/11-dev-pm-ops.patch
@@ -14,7 +14,6 @@ calls on compat code with only slight modifications.
  static int		ath5k_pci_suspend(struct device *dev);
  static int		ath5k_pci_resume(struct device *dev);
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-+#endif
 +static int ath5k_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state)
 +{
 +	int r;
@@ -40,6 +39,7 @@ calls on compat code with only slight modifications.
 +
 +	return ath5k_pci_resume(&pdev->dev);
 +}
++#endif
  
  SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume);
  #define ATH5K_PM_OPS	(&ath5k_pm_ops)
-- 
1.6.3.3

[PATCH 3/4] refresh patches

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 compat/patches/01-netdev.patch                  |    2 +-
 compat/patches/08-rename-iwl4965-config.patch   |    2 +-
 compat/patches/09-threaded-irq.patch            |    2 +-
 compat/patches/15-symbol-export-conflicts.patch |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compat/patches/01-netdev.patch b/compat/patches/01-netdev.patch
index 0a858f2..2048348 100644
--- a/compat/patches/01-netdev.patch
+++ b/compat/patches/01-netdev.patch
@@ -511,7 +511,7 @@ without creating a headache on maintenance of the pathes.
  #define LBS_DEB_LEAVE	0x00000002
 --- a/drivers/net/wireless/mac80211_hwsim.c	2009-08-18 16:18:52.829350750 -0700
 +++ b/drivers/net/wireless/mac80211_hwsim.c	2009-08-18 16:18:52.977352457 -0700
-@@ -816,16 +816,22 @@
+@@ -872,16 +872,22 @@
  	.name = "mac80211_hwsim"
  };
  
diff --git a/compat/patches/08-rename-iwl4965-config.patch b/compat/patches/08-rename-iwl4965-config.patch
index 3b90c0f..78a6b6f 100644
--- a/compat/patches/08-rename-iwl4965-config.patch
+++ b/compat/patches/08-rename-iwl4965-config.patch
@@ -16,7 +16,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly.
  iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c	2009-11-02 08:07:33.000000000 -0800
 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c	2009-11-02 08:07:33.000000000 -0800
-@@ -3323,10 +3323,10 @@
+@@ -3416,10 +3416,10 @@
  
  /* Hardware specific file defines the PCI IDs table for that hardware module */
  static struct pci_device_id iwl_hw_card_ids[] = {
diff --git a/compat/patches/09-threaded-irq.patch b/compat/patches/09-threaded-irq.patch
index e59cafc..a5aace6 100644
--- a/compat/patches/09-threaded-irq.patch
+++ b/compat/patches/09-threaded-irq.patch
@@ -51,7 +51,7 @@ thread in process context as well.
  	b43_release_firmware(dev);
 --- a/drivers/net/wireless/b43/b43.h	2009-10-19 11:36:44.000000000 +0900
 +++ b/drivers/net/wireless/b43/b43.h	2009-10-19 11:36:45.000000000 +0900
-@@ -747,6 +747,9 @@
+@@ -745,6 +745,9 @@
  	unsigned int tx_count;
  	unsigned int rx_count;
  #endif
diff --git a/compat/patches/15-symbol-export-conflicts.patch b/compat/patches/15-symbol-export-conflicts.patch
index 70ff4c9..1f2e9e6 100644
--- a/compat/patches/15-symbol-export-conflicts.patch
+++ b/compat/patches/15-symbol-export-conflicts.patch
@@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our.
 
 --- a/net/mac80211/rx.c	2009-11-02 08:08:54.000000000 -0800
 +++ b/net/mac80211/rx.c	2009-11-02 08:08:55.000000000 -0800
-@@ -2536,7 +2536,12 @@
+@@ -2480,7 +2480,12 @@
   drop:
  	kfree_skb(skb);
  }
-- 
1.6.3.3

[PATCH 4/4] [compat-2.6] Add symbol CONFIG_RT2800_LIB

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 config.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.mk b/config.mk
index ce70832..9a04dea 100644
--- a/config.mk
+++ b/config.mk
@@ -248,6 +248,7 @@ CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_PCI=y
 NEED_RT2X00=y
 
 # Two rt2x00 drivers require firmware: rt61pci and rt73usb. They depend on
@@ -368,14 +369,13 @@ endif # end of SDIO driver list
 
 # Common rt2x00 requirements
 ifeq ($(NEED_RT2X00),y)
-CONFIG_RT2X00=m
+CONFIG_RT2X00=y
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2800_LIB=m
 CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_RFKILL=y
 CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG=y
 endif
 
-- 
1.6.3.3

[PATCH 4/4] [compat-2.6] Add symbol CONFIG_RT2800_LIB

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 config.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.mk b/config.mk
index ce70832..9a04dea 100644
--- a/config.mk
+++ b/config.mk
@@ -248,6 +248,7 @@ CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_PCI=y
 NEED_RT2X00=y
 
 # Two rt2x00 drivers require firmware: rt61pci and rt73usb. They depend on
@@ -368,14 +369,13 @@ endif # end of SDIO driver list
 
 # Common rt2x00 requirements
 ifeq ($(NEED_RT2X00),y)
-CONFIG_RT2X00=m
+CONFIG_RT2X00=y
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2800_LIB=m
 CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_RFKILL=y
 CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG=y
 endif
 
-- 
1.6.3.3