From b27bc0f736bfc6f60b8dbbb2b8ec085e5dd58d25 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 7 Jul 2009 23:41:27 +0200
Subject: [PATCH] --- yaml --- r: 159071 b: refs/heads/master c:
 a71d62dbf3f0523b7a456333196cb26cf783fe92 h: refs/heads/master i:   159069:
 30f70829cb440da10271286b34e453a00756bd92   159067:
 6fb75265cd0998207cb422ba7cca5fc6eae63270   159063:
 1323e84e98e93f85710c68c617414f3844a323d9   159055:
 b2805acad854cb9f08858a3231f556ca09530c68   159039:
 ed9f709e653f0b285d339a6d176e69914d133db9 v: v3

---
 [refs]                           |  2 +-
 trunk/net/wireless/wext-compat.c | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4c51b0eeabca..e402c01af443 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0f114e82e3781087a0ad0e92c94ff0d55012c1a
+refs/heads/master: a71d62dbf3f0523b7a456333196cb26cf783fe92
diff --git a/trunk/net/wireless/wext-compat.c b/trunk/net/wireless/wext-compat.c
index 9d101d566bb1..5088d89a30fc 100644
--- a/trunk/net/wireless/wext-compat.c
+++ b/trunk/net/wireless/wext-compat.c
@@ -1127,7 +1127,7 @@ int cfg80211_wext_giwrate(struct net_device *dev,
 	struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
 	/* we are under RTNL - globally locked - so can use a static struct */
 	static struct station_info sinfo;
-	u8 *addr;
+	u8 addr[ETH_ALEN];
 	int err;
 
 	if (wdev->iftype != NL80211_IFTYPE_STATION)
@@ -1136,12 +1136,15 @@ int cfg80211_wext_giwrate(struct net_device *dev,
 	if (!rdev->ops->get_station)
 		return -EOPNOTSUPP;
 
+	err = 0;
+	wdev_lock(wdev);
 	if (wdev->current_bss)
-		addr = wdev->current_bss->pub.bssid;
-	else if (wdev->wext.connect.bssid)
-		addr = wdev->wext.connect.bssid;
+		memcpy(addr, wdev->current_bss->pub.bssid, ETH_ALEN);
 	else
-		return -EOPNOTSUPP;
+		err = -EOPNOTSUPP;
+	wdev_unlock(wdev);
+	if (err)
+		return err;
 
 	err = rdev->ops->get_station(&rdev->wiphy, dev, addr, &sinfo);
 	if (err)