From: Arend van Spriel Date: Fri, 8 Feb 2013 14:53:51 +0000 (+0100) Subject: brcmfmac: change function signatures X-Git-Tag: MMI-PSA29.97-13-9~15013^2~31^2^2~35 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1ce3086ccd81793fd6affb350826a0c41dc3ef37;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git brcmfmac: change function signatures cfg80211 api change needs to be applied. this change will be squashed with introducing commit: commit 68751daec95b07a74b18aa22b2f9c196991dbe81 Author: Hante Meuleman Date: Mon Nov 26 12:21:27 2012 +0100 brcmfmac: add support for P2P listen mode. Signed-off-by: Arend van Spriel Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c index aac054cc0069..1c854f607d5b 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c @@ -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; }