[PATCH 0/4] compat-wireless: some fixes

[PATCH 0/4] compat-wireless: some fixes

[Hauke Mehrtens]

This patch series replaces the old one send on Tuesday.
Now brcm80211 builds without debugging activated and all patches in the 
patches directory are applying onto todays linux-next.

Hauke Mehrtens (4):
  compat-wireless: make patches apply again
  compat-wireless: brcm80211 adapt changes in mac80211
  compat-wireless: build zd1211rw only for kernel >= 2.6.29
  compat-wireless: activate BRCMFMAC

 config.mk                                    |    8 ++++--
 patches/16-bluetooth.patch                   |   32 +++++++++++++-------------
 patches/31-backport-sk_add_backlog.patch     |    6 ++--
 patches/35-fix-makefile-includes.patch       |   14 +++++-----
 patches/38-brcm80211-mac80211-backport.patch |   14 +++++++++++
 5 files changed, 45 insertions(+), 29 deletions(-)
 create mode 100644 patches/38-brcm80211-mac80211-backport.patch

[PATCH 1/4] compat-wireless: make patches apply again

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/16-bluetooth.patch               |   32 +++++++++++++++---------------
 patches/31-backport-sk_add_backlog.patch |    6 ++--
 patches/35-fix-makefile-includes.patch   |   14 ++++++------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index c94528a..d54e517 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -547,9 +547,21 @@ here still, but for now we keep this here.
  {
  	struct sock *sk;
  
---- a/net/bluetooth/l2cap.c
-+++ b/net/bluetooth/l2cap.c
-@@ -982,8 +982,12 @@ static struct sock *l2cap_sock_alloc(str
+--- a/net/bluetooth/l2cap_sock.c
++++ b/net/bluetooth/l2cap_sock.c
+@@ -520,7 +520,11 @@ static int l2cap_sock_getsockopt(struct
+ 	return err;
+ }
+ 
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
+ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __user *optval, unsigned int optlen)
++#else
++static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)
++#endif
+ {
+ 	struct sock *sk = sock->sk;
+ 	struct l2cap_options opts;
+@@ -1067,8 +1071,12 @@ struct sock *l2cap_sock_alloc(struct net
  	return sk;
  }
  
@@ -562,7 +574,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk;
  
-@@ -995,7 +999,11 @@ static int l2cap_sock_create(struct net
+@@ -1080,7 +1088,11 @@ static int l2cap_sock_create(struct net
  			sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
  		return -ESOCKTNOSUPPORT;
  
@@ -574,15 +586,3 @@ here still, but for now we keep this here.
  		return -EPERM;
  
  	sock->ops = &l2cap_sock_ops;
-@@ -2043,7 +2051,11 @@ static int l2cap_sock_setsockopt_old(str
- 	return err;
- }
- 
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
- static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen)
-+#else
-+static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)
-+#endif
- {
- 	struct sock *sk = sock->sk;
- 	struct bt_security sec;
diff --git a/patches/31-backport-sk_add_backlog.patch b/patches/31-backport-sk_add_backlog.patch
index 704c7c6..916d31f 100644
--- a/patches/31-backport-sk_add_backlog.patch
+++ b/patches/31-backport-sk_add_backlog.patch
@@ -7,9 +7,9 @@ limitted caller via a3a858ff. The older kernels don't have a
 size and as such always are successfull when adding to the
 backlog.
 
---- a/net/bluetooth/l2cap.c
-+++ b/net/bluetooth/l2cap.c
-@@ -4449,8 +4449,12 @@ static inline int l2cap_data_channel(str
+--- a/net/bluetooth/l2cap_core.c
++++ b/net/bluetooth/l2cap_core.c
+@@ -3368,8 +3368,12 @@ static inline int l2cap_data_channel(str
  		if (!sock_owned_by_user(sk)) {
  			l2cap_ertm_data_rcv(sk, skb);
  		} else {
diff --git a/patches/35-fix-makefile-includes.patch b/patches/35-fix-makefile-includes.patch
index 2142da2..ea5b41d 100644
--- a/patches/35-fix-makefile-includes.patch
+++ b/patches/35-fix-makefile-includes.patch
@@ -20,11 +20,11 @@ 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
-@@ -32,9 +32,9 @@ ccflags-y :=			\
- 	-DPKT_FILTER_SUPPORT	\
- 	-DSHOW_EVENTS		\
- 	-DTOE			\
--	-Idrivers/staging/brcm80211/brcmfmac		\
+@@ -35,9 +35,9 @@ ccflags-y :=			\
+ ccflags-$(CONFIG_BRCMDBG)	+= -DDHD_DEBUG
+ 
+ ccflags-y += \
+-	-Idrivers/staging/brcm80211/brcmfmac	\
 -	-Idrivers/staging/brcm80211/include		\
 -	-Idrivers/staging/brcm80211/util
 +	-I$(obj)		\
@@ -35,9 +35,9 @@ 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
-@@ -24,10 +24,10 @@ ccflags-y :=					\
+@@ -23,10 +23,10 @@ ccflags-y :=				\
+ 	-DWL11N					\
  	-DDBAND					\
- 	-DBCMDMA32				\
  	-DBCMNVRAMR				\
 -	-Idrivers/staging/brcm80211/brcmsmac \
 -	-Idrivers/staging/brcm80211/brcmsmac/phy \
-- 
1.7.1

[PATCH 2/4] compat-wireless: brcm80211 adapt changes in mac80211

[Hauke Mehrtens]

The interface to mac80211 changes and brcm80211 uses the old one.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/38-brcm80211-mac80211-backport.patch |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 patches/38-brcm80211-mac80211-backport.patch

diff --git a/patches/38-brcm80211-mac80211-backport.patch b/patches/38-brcm80211-mac80211-backport.patch
new file mode 100644
index 0000000..329a119
--- /dev/null
+++ b/patches/38-brcm80211-mac80211-backport.patch
@@ -0,0 +1,14 @@
+This patch is a temporary solution as long as staging uses an older 
+version of mac80211.
+
+--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
++++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+@@ -2312,7 +2312,7 @@ static s32 wl_inform_single_bss(struct w
+ 	notif_bss_info->frame_len =
+ 	    offsetof(struct ieee80211_mgmt,
+ 		     u.beacon.variable) + wl_get_ielen(wl);
+-	freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
++	freq = ieee80211_channel_to_frequency(notif_bss_info->channel, notif_bss_info->band);
+ 	channel = ieee80211_get_channel(wiphy, freq);
+ 
+ 	WL_DBG("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM\n",
-- 
1.7.1

[PATCH 3/4] compat-wireless: build zd1211rw only for kernel >= 2.6.29

[Hauke Mehrtens]

zd1211rw uses usb_queue_reset_device() which is not backported now.

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

diff --git a/config.mk b/config.mk
index d8712e8..9a206d9 100644
--- a/config.mk
+++ b/config.mk
@@ -387,8 +387,12 @@ CONFIG_EEPROM_93CX6=m
 
 # USB Drivers
 ifdef CONFIG_USB
+ifndef CONFIG_COMPAT_KERNEL_29
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG=y
+else
+CONFIG_ZD1211RW=n
+endif #CONFIG_COMPAT_KERNEL_29
 
 # Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat...
 
-- 
1.7.1

[PATCH 4/4] compat-wireless: activate BRCMFMAC

[Hauke Mehrtens]

It is now possible to build BRCMFMAC and BRCMSMAC.

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

diff --git a/config.mk b/config.mk
index 9a206d9..e7f04ea 100644
--- a/config.mk
+++ b/config.mk
@@ -557,9 +557,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_BRCMSMAC and CONFIG_BRCMFMAC as
-# module at the same time
-# CONFIG_BRCMFMAC=y
+CONFIG_BRCMFMAC=y
 
 endif #CONFIG_WIRELESS_EXT
 endif #CONFIG_MMC
-- 
1.7.1

Re: [PATCH 0/4] compat-wireless: some fixes

[Luis R. Rodriguez]

On Thu, Feb 10, 2011 at 7:26 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> This patch series replaces the old one send on Tuesday.
> Now brcm80211 builds without debugging activated and all patches in the
> patches directory are applying onto todays linux-next.
>
> Hauke Mehrtens (4):
>  compat-wireless: make patches apply again
>  compat-wireless: brcm80211 adapt changes in mac80211
>  compat-wireless: build zd1211rw only for kernel >= 2.6.29
>  compat-wireless: activate BRCMFMAC

Thanks! Applied all and pushed!

  Luis