Return-path: Received: from wolverine01.qualcomm.com ([199.106.114.254]:15461 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756678AbcC2KyG (ORCPT ); Tue, 29 Mar 2016 06:54:06 -0400 From: Jouni Malinen To: Johannes Berg CC: Subject: [PATCH 2/2] cfg80211: Allow reassociation to be requested with internal SME Date: Tue, 29 Mar 2016 13:53:28 +0300 Message-ID: <1459248808-16412-2-git-send-email-jouni@qca.qualcomm.com> (sfid-20160329_125410_329794_03D2E520) In-Reply-To: <1459248808-16412-1-git-send-email-jouni@qca.qualcomm.com> References: <1459248808-16412-1-git-send-email-jouni@qca.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-wireless-owner@vger.kernel.org List-ID: If the user space issues a NL80211_CMD_CONNECT with NL80211_ATTR_PREV_BSSID when there is already a connection, allow this to proceed as a reassociation instead of rejecting the new connect command with EALREADY. Signed-off-by: Jouni Malinen --- net/wireless/nl80211.c | 3 ++- net/wireless/sme.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index a98665a..773b20f 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -8117,7 +8117,8 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info) } wdev_lock(dev->ieee80211_ptr); - err = cfg80211_connect(rdev, dev, &connect, connkeys, NULL); + err = cfg80211_connect(rdev, dev, &connect, connkeys, + connect.prev_bssid); wdev_unlock(dev->ieee80211_ptr); if (err) kzfree(connkeys); diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 65882d2..ce32492 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -492,8 +492,15 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, if (!rdev->ops->auth || !rdev->ops->assoc) return -EOPNOTSUPP; - if (wdev->current_bss) - return -EALREADY; + if (wdev->current_bss) { + if (!prev_bssid) + return -EALREADY; + cfg80211_unhold_bss(wdev->current_bss); + cfg80211_put_bss(wdev->wiphy, &wdev->current_bss->pub); + wdev->current_bss = NULL; + + cfg80211_sme_free(wdev); + } if (WARN_ON(wdev->conn)) return -EINPROGRESS; -- 1.9.1