From 0e30c778fbdd223ed610d73985bccf181bc51d44 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 19 Jan 2010 10:53:30 -0800 Subject: [PATCH] --- yaml --- r: 183867 b: refs/heads/master c: 27e310c91c3433ab9997b925b3fd65e660634c76 h: refs/heads/master i: 183865: afa42c8271e8797ba906f3e8b370be91a2b26cfc 183863: e07981641705ca71c4f23c0d246d5d72689f57ea v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 59aefe8c81dd..9b45bd67fbdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1625c148cde23a8b4180e171ed4a17e17521b995 +refs/heads/master: 27e310c91c3433ab9997b925b3fd65e660634c76 diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index 4af7991a9ec8..5b79ecf17bea 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -3571,6 +3571,7 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info) { struct cfg80211_registered_device *rdev; struct net_device *dev; + struct wireless_dev *wdev; struct cfg80211_crypto_settings crypto; struct ieee80211_channel *chan, *fixedchan; const u8 *bssid, *ssid, *ie = NULL, *prev_bssid = NULL; @@ -3616,7 +3617,8 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info) } mutex_lock(&rdev->devlist_mtx); - fixedchan = rdev_fixed_channel(rdev, NULL); + wdev = dev->ieee80211_ptr; + fixedchan = rdev_fixed_channel(rdev, wdev); if (fixedchan && chan != fixedchan) { err = -EBUSY; mutex_unlock(&rdev->devlist_mtx);