[kernel] r18990 - in dists/sid/linux-2.6/debian/patches: bugfix/all series

[Ben Hutchings]

Author: benh
Date: Sat May 12 09:30:01 2012
New Revision: 18990

Log:
brcm80211: smac: pass missing argument to 'brcms_b_mute'

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/brcm80211-smac-pass-missing-argument-to-brcms_b_mute.patch
Modified:
   dists/sid/linux-2.6/debian/patches/series/base

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/brcm80211-smac-pass-missing-argument-to-brcms_b_mute.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/brcm80211-smac-pass-missing-argument-to-brcms_b_mute.patch	Sat May 12 09:30:01 2012	(r18990)
@@ -0,0 +1,44 @@
+From jrnieder at gmail.com Sat May 12 01:35:51 2012
+Date: Fri, 11 May 2012 19:35:33 -0500
+From: Jonathan Nieder <jrnieder at gmail.com>
+Subject: brcm80211: smac: pass missing argument to 'brcms_b_mute'
+
+[Not needed upstream --- this bug is specific to 3.2.y.]
+
+Commit c6c44893c864, which removes the flag argument from brcms_b_mute,
+is not part of 3.2.y, and we forgot to adjust a new call accordingly
+when applying commit badc4f07622f ("brcm80211: smac: resume transmit
+fifo upon receiving frames").
+
+ drivers/net/wireless/brcm80211/brcmsmac/main.c: In function 'brcms_c_recvctl':
+ drivers/net/wireless/brcm80211/brcmsmac/main.c:7882:4: error: too few arguments to function 'brcms_b_mute'
+ drivers/net/wireless/brcm80211/brcmsmac/main.c:2538:13: note: declared here
+
+Earlier build tests missed this because they didn't include this driver
+due to 'depends on BCMA=n'.
+
+Reported-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/net/wireless/brcm80211/brcmsmac/main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
+index f98becc9e169..833cbefcbfd2 100644
+--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
+@@ -7879,7 +7879,7 @@ brcms_c_recvctl(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
+ 	if (wlc->hw->suspended_fifos) {
+ 		hdr = (struct ieee80211_hdr *)p->data;
+ 		if (ieee80211_is_beacon(hdr->frame_control))
+-			brcms_b_mute(wlc->hw, false);
++			brcms_b_mute(wlc->hw, false, 0);
+ 	}
+ 
+ 	memcpy(IEEE80211_SKB_RXCB(p), &rx_status, sizeof(rx_status));
+-- 
+1.7.10.1
+
+
+

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Fri May 11 22:47:31 2012	(r18989)
+++ dists/sid/linux-2.6/debian/patches/series/base	Sat May 12 09:30:01 2012	(r18990)
@@ -191,3 +191,4 @@
 + debian/efi-avoid-ABI-change.patch
 
 + bugfix/all/ext4-Report-max_batch_time-option-correctly.patch
++ bugfix/all/brcm80211-smac-pass-missing-argument-to-brcms_b_mute.patch