45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From jrnieder@gmail.com Sat May 12 01:35:51 2012
|
|
Date: Fri, 11 May 2012 19:35:33 -0500
|
|
From: Jonathan Nieder <jrnieder@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@decadent.org.uk>
|
|
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
|
|
Signed-off-by: Ben Hutchings <ben@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
|
|
|
|
|
|
|