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

Commit c031df31 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

brcmsmac: react on changing SSID 



To send the correct probe response the hardware needs to know the SSID
when it changed.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent af44e258

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

+6 −0
Original line number Diff line number Diff line
@@ -521,6 +521,12 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw, 
		brcms_c_set_addrmatch(wl->wlc, RCM_BSSID_OFFSET, info->bssid);

		spin_unlock_bh(&wl->lock);

	}

	if (changed & BSS_CHANGED_SSID) {

		/* BSSID changed, for whatever reason (IBSS and managed mode) */

		spin_lock_bh(&wl->lock);

		brcms_c_set_ssid(wl->wlc, info->ssid, info->ssid_len);

		spin_unlock_bh(&wl->lock);

	}

	if (changed & BSS_CHANGED_BEACON) {

		/* Beacon data changed, retrieve new beacon (beaconing modes) */

		struct sk_buff *beacon;

drivers/net/wireless/brcm80211/brcmsmac/main.c

+9 −0
Original line number Diff line number Diff line
@@ -3783,6 +3783,15 @@ static void brcms_c_set_bssid(struct brcms_bss_cfg *bsscfg) 
	brcms_c_set_addrmatch(bsscfg->wlc, RCM_BSSID_OFFSET, bsscfg->BSSID);

}



void brcms_c_set_ssid(struct brcms_c_info *wlc, u8 *ssid, size_t ssid_len)

{

	u8 len = min_t(u8, sizeof(wlc->bsscfg->SSID), ssid_len);

	memset(wlc->bsscfg->SSID, 0, sizeof(wlc->bsscfg->SSID));



	memcpy(wlc->bsscfg->SSID, ssid, len);

	wlc->bsscfg->SSID_len = len;

}



static void brcms_b_set_shortslot(struct brcms_hardware *wlc_hw, bool shortslot)

{

	wlc_hw->shortslot = shortslot;

drivers/net/wireless/brcm80211/brcmsmac/pub.h

+2 −0
Original line number Diff line number Diff line
@@ -336,5 +336,7 @@ extern void brcms_c_update_beacon(struct brcms_c_info *wlc); 
extern void brcms_c_set_new_beacon(struct brcms_c_info *wlc,

				   struct sk_buff *beacon, u16 tim_offset,

				   u16 dtim_period);

extern void brcms_c_set_ssid(struct brcms_c_info *wlc, u8 *ssid,

			     size_t ssid_len);



#endif				/* _BRCM_PUB_H_ */