diff options
author | Arend van Spriel <arend@broadcom.com> | 2013-04-05 04:57:53 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-04-08 15:28:47 -0400 |
commit | 5b57af6ef7d087f58b2603796f594659f3978bff (patch) | |
tree | 6e3473cc21c512f7c58ad5394bb0edd69240f061 /drivers/net/wireless/brcm80211 | |
parent | bffc61c9ca5c27e9b1e081e7390715d2b93168ed (diff) |
brcmfmac: obtain wdev using vif object in action frame rx
The function brcmf_p2p_notify_action_frame_rx() the wireless_dev
is needed to pass the action frame to cfg80211. The wireless_dev
is held in brcmf_cfg80211_vif object. Use that instead of the
ieee80211_ptr in net_device as P2P_DEVICE interface does not have
a net_device associated with it.
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c index 6f165565fe61..94ff045df2b3 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c | |||
@@ -1431,7 +1431,8 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp, | |||
1431 | CHSPEC_IS2G(chanspec) ? | 1431 | CHSPEC_IS2G(chanspec) ? |
1432 | IEEE80211_BAND_2GHZ : | 1432 | IEEE80211_BAND_2GHZ : |
1433 | IEEE80211_BAND_5GHZ); | 1433 | IEEE80211_BAND_5GHZ); |
1434 | wdev = ifp->ndev->ieee80211_ptr; | 1434 | |
1435 | wdev = &ifp->vif->wdev; | ||
1435 | cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len, | 1436 | cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len, |
1436 | GFP_ATOMIC); | 1437 | GFP_ATOMIC); |
1437 | 1438 | ||