Commit f418bad6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mac80211-for-net-2021-02-02' of... 

Merge tag 'mac80211-for-net-2021-02-02' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Two fixes:
 - station rate tables were not updated correctly
   after association, leading to bad configuration
 - rtl8723bs (staging) was initializing data incorrectly
   after the previous fix and needed to move the init
   later

* tag 'mac80211-for-net-2021-02-02' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211:
  staging: rtl8723bs: Move wiphy setup to after reading the regulatory settings from the chip
  mac80211: fix station rate table updates on assoc
====================

Link: https://lore.kernel.org/r/20210202143505.37610-1-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 188fa104 50af06d4

drivers/staging/rtl8723bs/os_dep/sdio_intf.c

+2 −2
Original line number Diff line number Diff line
@@ -339,8 +339,6 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct 


	padapter = rtw_netdev_priv(pnetdev);



	rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj));



	/* 3 3. init driver special setting, interface, OS and hardware relative */



	/* 4 3.1 set hardware operation functions */
@@ -378,6 +376,8 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct 
		goto free_hal_data;

	}



	rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj));



	/* 3 8. get WLan MAC address */

	/*  set mac addr */

	rtw_macaddr_cfg(&psdio->func->dev, padapter->eeprompriv.mac_addr);

net/mac80211/driver-ops.c

+4 −1
Original line number Diff line number Diff line
@@ -125,8 +125,11 @@ int drv_sta_state(struct ieee80211_local *local, 
	} else if (old_state == IEEE80211_STA_AUTH &&

		   new_state == IEEE80211_STA_ASSOC) {

		ret = drv_sta_add(local, sdata, &sta->sta);

		if (ret == 0)

		if (ret == 0) {

			sta->uploaded = true;

			if (rcu_access_pointer(sta->sta.rates))

				drv_sta_rate_tbl_update(local, sdata, &sta->sta);

		}

	} else if (old_state == IEEE80211_STA_ASSOC &&

		   new_state == IEEE80211_STA_AUTH) {

		drv_sta_remove(local, sdata, &sta->sta);

net/mac80211/rate.c

+2 −1
Original line number Diff line number Diff line
@@ -960,6 +960,7 @@ int rate_control_set_rates(struct ieee80211_hw *hw, 
	if (old)

		kfree_rcu(old, rcu_head);



	if (sta->uploaded)

		drv_sta_rate_tbl_update(hw_to_local(hw), sta->sdata, pubsta);



	ieee80211_sta_set_expected_throughput(pubsta, sta_get_expected_throughput(sta));