hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cfg80211: fix wext stats 

Instead of using the wext BSSID which may be NULL if
you haven't explicitly set one, we should instead use
the current_bss pointer -- if that's NULL we aren't
connected anyway. Fixes missing signal quality output
reported to me internally at Intel.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2009-07-10 16:54:07 +02:00 committed by John W. Linville
parent ca3dbc20d4
commit c56c5714f1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/wireless/wext-compat.c
View File

@ -1209,7 +1209,7 @@ struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
/* we are under RTNL - globally locked - so can use static structs */ /* we are under RTNL - globally locked - so can use static structs */
static struct iw_statistics wstats; static struct iw_statistics wstats;
static struct station_info sinfo; static struct station_info sinfo;
u8 *addr; u8 bssid[ETH_ALEN];
if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION)
return NULL; return NULL;
@ -1217,11 +1217,16 @@ struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
if (!rdev->ops->get_station) if (!rdev->ops->get_station)
return NULL; return NULL;
addr = wdev->wext.connect.bssid; /* Grab BSSID of current BSS, if any */
if (!addr) wdev_lock(wdev);
if (!wdev->current_bss) {
wdev_unlock(wdev);
return NULL; return NULL;
}
memcpy(bssid, wdev->current_bss->pub.bssid, ETH_ALEN);
wdev_unlock(wdev);
if (rdev->ops->get_station(&rdev->wiphy, dev, addr, &sinfo)) if (rdev->ops->get_station(&rdev->wiphy, dev, bssid, &sinfo))
return NULL; return NULL;
memset(&wstats, 0, sizeof(wstats)); memset(&wstats, 0, sizeof(wstats));