diff options
| author | Samuel Ortiz <samuel.ortiz@intel.com> | 2009-07-03 02:00:48 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 21:02:27 +0200 |
| commit | 6c230c02700f9d2aebe6edf9f571835c06707940 (patch) | |
| tree | 5cfdd046376e74d32d4c32be1c1ef12ba57dce86 /net/wireless/wext-compat.c | |
| parent | rt2x00: use wiphy rfkill interface (diff) | |
| download | linux-6c230c02700f9d2aebe6edf9f571835c06707940.tar.xz linux-6c230c02700f9d2aebe6edf9f571835c06707940.zip | |
cfg80211: check for current_bss from giwrate
When connecting to an ESSID manually, we may not set the BSSID, and thus
wdev->wext.connect.bssid will be NULL.
wdev->current_bss is always updated when a connection is established so we
should check it first.
Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/wext-compat.c')
| -rw-r--r-- | net/wireless/wext-compat.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index d39688ca7fe5..2c33cd83cfe9 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -1136,8 +1136,11 @@ int cfg80211_wext_giwrate(struct net_device *dev, if (!rdev->ops->get_station) return -EOPNOTSUPP; - addr = wdev->wext.connect.bssid; - if (!addr) + if (wdev->current_bss) + addr = wdev->current_bss->pub.bssid; + else if (wdev->wext.connect.bssid) + addr = wdev->wext.connect.bssid; + else return -EOPNOTSUPP; err = rdev->ops->get_station(&rdev->wiphy, dev, addr, &sinfo); |