From patchwork Wed Mar 19 09:04:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang ZHAO X-Patchwork-Id: 3858191 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D1222BF540 for ; Wed, 19 Mar 2014 18:07:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C62F200DC for ; Wed, 19 Mar 2014 18:07:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 332D92021A for ; Wed, 19 Mar 2014 18:07:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758535AbaCSJEz (ORCPT ); Wed, 19 Mar 2014 05:04:55 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:53514 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758500AbaCSJEv (ORCPT ); Wed, 19 Mar 2014 05:04:51 -0400 Received: by mail-pa0-f41.google.com with SMTP id fa1so8698257pad.28 for ; Wed, 19 Mar 2014 02:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=y2o6y9Hm4wZT9PCXaCxdo6V88yceQbMHcSWWoC2OtbI=; b=nTsruivCZ7qgEIUPE82YM+gI+ilQeI82456iUUHqrgV5iPGnmfk8+X/FSYJTAxW0U2 IfiQF+u86G9wozy6np0+exf1/3RS3cMBRn2iHODDz+hIEgGS7lmNmtVPWXdlf3iJ3SuZ ziFXU00XJ25UpF47eHReSBJgewHHdtqqR6xw9jBKUtpbiLvI0k72g3D3LyWbqqKN61wJ ++0hySAB+WqySzWFG+RWNYJzLYhwbGDrqJ9LBloPgPoGT8/hHx7LsTWjIiTY1Xt0xrf4 NXcNzOB3TTslK5vJZJpccOxwAqhbOnXk8HHYjd1f1wm4Hh4YJWS0JDFLEqMRJ9P56c2Y NoAg== X-Received: by 10.68.197.8 with SMTP id iq8mr39248342pbc.124.1395219891059; Wed, 19 Mar 2014 02:04:51 -0700 (PDT) Received: from localhost.localdomain ([175.153.40.115]) by mx.google.com with ESMTPSA id qq5sm60201510pbb.24.2014.03.19.02.04.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Mar 2014 02:04:50 -0700 (PDT) From: "Zhao, Gang" To: Cc: Johannes Berg Subject: [PATCH 3/3] cfg80211: slightly clean up of cfg80211_sme_connect() Date: Wed, 19 Mar 2014 17:04:37 +0800 Message-Id: <2765d477f16c3ade4361cbbbc170f7343b433b23.1395219362.git.gamerh2o@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <195ce75d7f8c2db484ccea7453147289e880c148.1395219362.git.gamerh2o@gmail.com> References: <195ce75d7f8c2db484ccea7453147289e880c148.1395219362.git.gamerh2o@gmail.com> In-Reply-To: <195ce75d7f8c2db484ccea7453147289e880c148.1395219362.git.gamerh2o@gmail.com> References: <195ce75d7f8c2db484ccea7453147289e880c148.1395219362.git.gamerh2o@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Wdev->ssid has already been set in cfg80211_connect() and is equal to connect->ssid, so the assignment here doesn't hurt. Use connect->ssid instead of wdev->ssid so it will be consistent with following ssid_len assignment statement. If bss is found in cfg80211_get_conn_bss(), wdev->conn->state is set to CFG80211_CONN_AUTHENTICATE_NEXT in there. So it's not needed to set it manually to CFG80211_CONN_AUTHENTICATE_NEXT if bss is found in that function. Signed-off-by: Zhao, Gang --- net/wireless/sme.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/wireless/sme.c b/net/wireless/sme.c index acdcb4a8..c259aa6 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -467,7 +467,7 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, wdev->conn->auto_auth = false; } - wdev->conn->params.ssid = wdev->ssid; + wdev->conn->params.ssid = connect->ssid; wdev->conn->params.ssid_len = connect->ssid_len; /* see if we have the bss already */ @@ -480,7 +480,6 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, /* we're good if we have a matching bss struct */ if (bss) { - wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; err = cfg80211_conn_do_work(wdev); cfg80211_put_bss(wdev->wiphy, bss); } else {