Merge Linux 4.4.203-rc2 into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / net / wireless / brcm80211 / brcmfmac / p2p.c

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index 7dae935..83c123c 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -1434,8 +1434,8 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,
 
        freq = ieee80211_channel_to_frequency(ch.chnum,
                                              ch.band == BRCMU_CHAN_BAND_2G ?
-                                             IEEE80211_BAND_2GHZ :
-                                             IEEE80211_BAND_5GHZ);
+                                             NL80211_BAND_2GHZ :
+                                             NL80211_BAND_5GHZ);
 
        wdev = &ifp->vif->wdev;
        cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len, 0);
@@ -1917,8 +1917,8 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp,
        mgmt_frame_len = e->datalen - sizeof(*rxframe);
        freq = ieee80211_channel_to_frequency(ch.chnum,
                                              ch.band == BRCMU_CHAN_BAND_2G ?
-                                             IEEE80211_BAND_2GHZ :
-                                             IEEE80211_BAND_5GHZ);
+                                             NL80211_BAND_2GHZ :
+                                             NL80211_BAND_5GHZ);
 
        cfg80211_rx_mgmt(&vif->wdev, freq, 0, mgmt_frame, mgmt_frame_len, 0);