brcmfmac: change function signatures
authorArend van Spriel <arend@broadcom.com>
Fri, 8 Feb 2013 14:53:51 +0000 (15:53 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Feb 2013 19:51:40 +0000 (14:51 -0500)
cfg80211 api change needs to be applied. this change will be squashed
with introducing commit:

commit 68751daec95b07a74b18aa22b2f9c196991dbe81
Author: Hante Meuleman <meuleman@broadcom.com>
Date:   Mon Nov 26 12:21:27 2012 +0100

    brcmfmac: add support for P2P listen mode.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/brcm80211/brcmfmac/p2p.c

index aac054cc00690ee2aae47a73d9287b5ff5d3828b..1c854f607d5bf78bb48e59a8db4aa532ff4daad5 100644 (file)
@@ -982,9 +982,9 @@ int brcmf_p2p_remain_on_channel(struct wiphy *wiphy, struct wireless_dev *wdev,
 
        memcpy(&p2p->remain_on_channel, channel, sizeof(*channel));
        *cookie = p2p->remain_on_channel_cookie;
+       cfg80211_ready_on_channel(wdev, *cookie, channel, duration, GFP_KERNEL);
 
 exit:
-       cfg80211_ready_on_channel(wdev, *cookie, channel, duration, GFP_KERNEL);
        return err;
 }