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

Commit 5762d7d3 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

cfg80211: fix station info handling bugs 



Fix two places where the structure isn't initialized to zero,
and thus can't be filled properly by the driver.

Fixes: 4a4b8169 ("cfg80211: Accept multiple RSSI thresholds for CQM")
Fixes: 9930380f ("cfg80211: implement IWRATE")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd443f1e

net/wireless/nl80211.c

+1 −1
Original line number Diff line number Diff line
@@ -9809,7 +9809,7 @@ static int cfg80211_cqm_rssi_update(struct cfg80211_registered_device *rdev, 
	 */

	if (!wdev->cqm_config->last_rssi_event_value && wdev->current_bss &&

	    rdev->ops->get_station) {

		struct station_info sinfo;

		struct station_info sinfo = {};

		u8 *mac_addr;



		mac_addr = wdev->current_bss->pub.bssid;

net/wireless/wext-compat.c

+1 −2
Original line number Diff line number Diff line
@@ -1254,8 +1254,7 @@ static int cfg80211_wext_giwrate(struct net_device *dev, 
{

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);

	/* we are under RTNL - globally locked - so can use a static struct */

	static struct station_info sinfo;

	struct station_info sinfo = {};

	u8 addr[ETH_ALEN];

	int err;