Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-06-13 23:56:52 -07:00
parent a2f0fad32b c8d17b451a
commit 25c43bf13b
38 changed files with 200 additions and 88 deletions
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -1333,6 +1333,8 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
 	memcpy(bssid, wdev->current_bss->pub.bssid, ETH_ALEN);
 	wdev_unlock(wdev);

+	memset(&sinfo, 0, sizeof(sinfo));
+
 	if (rdev_get_station(rdev, dev, bssid, &sinfo))
 		return NULL;