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

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

[Hauke Mehrtens]

This just makes the patches apply again and builds with some kernels.
The patch in crap/0002-ath9k-Add-pktlog-support.patch does not apply 
any more and I do not have the time to make it apply again. It should 
be removed or someone else should fix it.

Hauke Mehrtens (2):
  compat-wireless: adapt chamhes in brcm80211
  compat-wireless: remove max_brightness

 config.mk                              |    4 +-
 patches/35-fix-makefile-includes.patch |   42 ++++++++++++++++----------------
 patches/37-led-max-brightness.patch    |   12 +++++++++
 3 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 patches/37-led-max-brightness.patch

[PATCH 1/2] compat-wireless: adapt chamhes in brcm80211

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 config.mk                              |    4 +-
 patches/35-fix-makefile-includes.patch |   42 ++++++++++++++++----------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/config.mk b/config.mk
index 7a29d46..d8712e8 100644
--- a/config.mk
+++ b/config.mk
@@ -538,7 +538,7 @@ CONFIG_BT_MRVL_SDIO=m
 ifneq ($(CONFIG_COMPAT_STAGING),)
 
 CONFIG_BRCM80211=m
-CONFIG_BRCM80211_PCI=y
+CONFIG_BRCMSMAC=y
 
 ifdef CONFIG_WIRELESS_EXT
 CONFIG_ATH6KL_CFG80211=y
@@ -553,7 +553,7 @@ CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
 CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
 CONFIG_ATH6K_LEGACY=m
 
-# It is not possible to compile CONFIG_BRCM80211 and CONFIG_BRCMFMAC as
+# It is not possible to compile CONFIG_BRCMSMAC and CONFIG_BRCMFMAC as
 # module at the same time
 # CONFIG_BRCMFMAC=y
 
diff --git a/patches/35-fix-makefile-includes.patch b/patches/35-fix-makefile-includes.patch
index c80e11f..2142da2 100644
--- a/patches/35-fix-makefile-includes.patch
+++ b/patches/35-fix-makefile-includes.patch
@@ -18,26 +18,9 @@ path the make process will search in the kernel tree for the headers.
  
 -ccflags-y += -Idrivers/net/wireless/rtl818x
 +ccflags-y += -I$(obj)/..
---- a/drivers/staging/brcm80211/Makefile
-+++ b/drivers/staging/brcm80211/Makefile
-@@ -24,10 +24,10 @@ ccflags-y :=					\
- 	-DDBAND					\
- 	-DBCMDMA32				\
- 	-DBCMNVRAMR				\
--	-Idrivers/staging/brcm80211/sys		\
--	-Idrivers/staging/brcm80211/phy		\
--	-Idrivers/staging/brcm80211/util	\
--	-Idrivers/staging/brcm80211/include
-+	-I$(obj)/sys		\
-+	-I$(obj)/phy		\
-+	-I$(obj)/util	\
-+	-I$(obj)/include
- 
- PCI_CFLAGS := -DWLC_LOW
- 
 --- a/drivers/staging/brcm80211/brcmfmac/Makefile
 +++ b/drivers/staging/brcm80211/brcmfmac/Makefile
-@@ -33,9 +33,9 @@ ccflags-y :=			\
+@@ -32,9 +32,9 @@ ccflags-y :=			\
  	-DPKT_FILTER_SUPPORT	\
  	-DSHOW_EVENTS		\
  	-DTOE			\
@@ -45,8 +28,25 @@ path the make process will search in the kernel tree for the headers.
 -	-Idrivers/staging/brcm80211/include		\
 -	-Idrivers/staging/brcm80211/util
 +	-I$(obj)		\
-+	-I$(obj)/../include		\
++	-I$(obj)/../include	\
 +	-I$(obj)/../util
  
- DHDOFILES = dhd_linux.o ../util/linux_osl.o ../util/bcmutils.o dhd_common.o dhd_custom_gpio.o	\
- 	wl_iw.o wl_cfg80211.o ../util/siutils.o ../util/sbutils.o ../util/aiutils.o ../util/hndpmu.o ../util/bcmwifi.o dhd_sdio.o	\
+ DHDOFILES = \
+ 	wl_cfg80211.o \
+--- a/drivers/staging/brcm80211/brcmsmac/Makefile
++++ b/drivers/staging/brcm80211/brcmsmac/Makefile
+@@ -24,10 +24,10 @@ ccflags-y :=					\
+ 	-DDBAND					\
+ 	-DBCMDMA32				\
+ 	-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 := \
+ 	wl_mac80211.o \
-- 
1.7.1

[PATCH 2/2] compat-wireless: remove max_brightness

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/37-led-max-brightness.patch |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 patches/37-led-max-brightness.patch

diff --git a/patches/37-led-max-brightness.patch b/patches/37-led-max-brightness.patch
new file mode 100644
index 0000000..ef684b5
--- /dev/null
+++ b/patches/37-led-max-brightness.patch
@@ -0,0 +1,12 @@
+--- a/drivers/net/wireless/iwlwifi/iwl-led.c
++++ b/drivers/net/wireless/iwlwifi/iwl-led.c
+@@ -149,7 +149,9 @@ void iwl_leds_init(struct iwl_priv *priv
+ 				   wiphy_name(priv->hw->wiphy));
+ 	priv->led.brightness_set = iwl_led_brightness_set;
+ 	priv->led.blink_set = iwl_led_blink_set;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
+ 	priv->led.max_brightness = 1;
++#endif
+ 
+ 	switch (mode) {
+ 	case IWL_LED_DEFAULT:
-- 
1.7.1

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

[Luis R. Rodriguez]

On Mon, Jan 31, 2011 at 2:06 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> This just makes the patches apply again and builds with some kernels.
> The patch in crap/0002-ath9k-Add-pktlog-support.patch does not apply
> any more and I do not have the time to make it apply again. It should
> be removed or someone else should fix it.
>
> Hauke Mehrtens (2):
>  compat-wireless: adapt chamhes in brcm80211
>  compat-wireless: remove max_brightness

Rock on, thanks a lot Hauke. Applied and pushed.

  Luis