staging: brcm80211: brcmfmac: Roamed channel info passed to cfg80211

With this patch, brcmfmac driver will pass roamed channel information to
cfg80211 via cfg80211_roamed() API.

Signed-off-by: Sukesh Srikakula <sukeshs@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index cf5708718e836e1032fdebbb5e9d64ee5b5bc4db..440ae6d43e31d82dbabb2b10a502050bde54e37d 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -2890,6 +2890,11 @@ brcmf_bss_roaming_done(struct brcmf_cfg80211_priv *cfg_priv,
                       const struct brcmf_event_msg *e, void *data)
 {
        struct brcmf_cfg80211_connect_info *conn_info = cfg_to_conn(cfg_priv);
+       struct wiphy *wiphy = cfg_to_wiphy(cfg_priv);
+       struct brcmf_channel_info channel;
+       struct ieee80211_channel *notify_channel;
+       struct ieee80211_supported_band *band;
+       u32 freq;
        s32 err = 0;
 
        WL_TRACE("Enter\n");
@@ -2898,7 +2903,21 @@ brcmf_bss_roaming_done(struct brcmf_cfg80211_priv *cfg_priv,
        brcmf_update_prof(cfg_priv, NULL, &e->addr, WL_PROF_BSSID);
        brcmf_update_bss_info(cfg_priv);
 
-       cfg80211_roamed(ndev, NULL,
+       brcmf_dev_ioctl(ndev, BRCMF_C_GET_CHANNEL, &channel, sizeof(channel));
+
+       channel.target_channel = le32_to_cpu(channel.target_channel);
+       WL_CONN("Roamed to channel %d\n", channel.target_channel);
+
+       if (channel.target_channel <= CH_MAX_2G_CHANNEL)
+               band = wiphy->bands[IEEE80211_BAND_2GHZ];
+       else
+               band = wiphy->bands[IEEE80211_BAND_5GHZ];
+
+       freq = ieee80211_channel_to_frequency(channel.target_channel,
+                                               band->band);
+       notify_channel = ieee80211_get_channel(wiphy, freq);
+
+       cfg80211_roamed(ndev, notify_channel,
                        (u8 *)brcmf_read_prof(cfg_priv, WL_PROF_BSSID),
                        conn_info->req_ie, conn_info->req_ie_len,
                        conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);