From c50670dda1c4ab2f712da65cbd5a4a8c019e7fec Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Fri, 5 Apr 2013 10:57:53 +0200 Subject: [PATCH] --- yaml --- r: 369179 b: refs/heads/master c: 5b57af6ef7d087f58b2603796f594659f3978bff h: refs/heads/master i: 369177: 3b6bbe786a14282160670b94a74bb1908e43d524 369175: 4884109aeec8c26896ea9841bce8be8473c9e1e5 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0d8611fb4db7..30508c14d820 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bffc61c9ca5c27e9b1e081e7390715d2b93168ed +refs/heads/master: 5b57af6ef7d087f58b2603796f594659f3978bff diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c index 6f165565fe61..94ff045df2b3 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c @@ -1431,7 +1431,8 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp, CHSPEC_IS2G(chanspec) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ); - wdev = ifp->ndev->ieee80211_ptr; + + wdev = &ifp->vif->wdev; cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len, GFP_ATOMIC);