Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0a79088 authored by Hante Meuleman's avatar Hante Meuleman Committed by Kalle Valo
Browse files

brcmfmac: Fix IBSS setup 



IBSS got broken over time. Disconnect events should not be given
for IBSS mode and connect events for IBSS need to have channel
information.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 353c46ac

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+9 −8
Original line number Diff line number Diff line
@@ -1273,17 +1273,17 @@ static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason) 


	brcmf_dbg(TRACE, "Enter\n");



	if (test_bit(BRCMF_VIF_STATUS_CONNECTED, &vif->sme_state)) {

	if (test_and_clear_bit(BRCMF_VIF_STATUS_CONNECTED, &vif->sme_state)) {

		brcmf_dbg(INFO, "Call WLC_DISASSOC to stop excess roaming\n ");

		err = brcmf_fil_cmd_data_set(vif->ifp,

					     BRCMF_C_DISASSOC, NULL, 0);

		if (err) {

			brcmf_err("WLC_DISASSOC failed (%d)\n", err);

		}

		clear_bit(BRCMF_VIF_STATUS_CONNECTED, &vif->sme_state);

		if ((vif->wdev.iftype == NL80211_IFTYPE_STATION) ||

		    (vif->wdev.iftype == NL80211_IFTYPE_P2P_CLIENT))

			cfg80211_disconnected(vif->wdev.netdev, reason, NULL, 0,

					      true, GFP_KERNEL);



	}

	clear_bit(BRCMF_VIF_STATUS_CONNECTING, &vif->sme_state);

	clear_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status);
@@ -2697,7 +2697,7 @@ static s32 brcmf_inform_bss(struct brcmf_cfg80211_info *cfg) 
	return err;

}



static s32 wl_inform_ibss(struct brcmf_cfg80211_info *cfg,

static s32 brcmf_inform_ibss(struct brcmf_cfg80211_info *cfg,

			     struct net_device *ndev, const u8 *bssid)

{

	struct wiphy *wiphy = cfg_to_wiphy(cfg);
@@ -2743,6 +2743,7 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_info *cfg, 
		band = wiphy->bands[IEEE80211_BAND_5GHZ];



	freq = ieee80211_channel_to_frequency(ch.chnum, band->band);

	cfg->channel = freq;

	notify_channel = ieee80211_get_channel(wiphy, freq);



	notify_capability = le16_to_cpu(bi->capability);
@@ -5071,9 +5072,9 @@ brcmf_notify_connect_status(struct brcmf_if *ifp, 
	} else if (brcmf_is_linkup(e)) {

		brcmf_dbg(CONN, "Linkup\n");

		if (brcmf_is_ibssmode(ifp->vif)) {

			brcmf_inform_ibss(cfg, ndev, e->addr);

			chan = ieee80211_get_channel(cfg->wiphy, cfg->channel);

			memcpy(profile->bssid, e->addr, ETH_ALEN);

			wl_inform_ibss(cfg, ndev, e->addr);

			cfg80211_ibss_joined(ndev, e->addr, chan, GFP_KERNEL);

			clear_bit(BRCMF_VIF_STATUS_CONNECTING,

				  &ifp->vif->sme_state);