]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
brcm80211: smac: pass missing argument to 'brcms_b_mute'
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 12 May 2012 00:35:33 +0000 (19:35 -0500)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 20 May 2012 21:56:38 +0000 (22:56 +0100)
[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

index f98becc9e1697cdbca3ee77e899ac1bf4b7e328d..833cbefcbfd2a8e1217567eb723e22b8bf38da7a 100644 (file)
@@ -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));