From patchwork Wed Dec 5 10:23:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1008150 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="T1U0Lm7V"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind-be.20150623.gappssmtp.com header.i=@mind-be.20150623.gappssmtp.com header.b="hK/tCe1f"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 438w0G2Wvdz9s8F for ; Wed, 5 Dec 2018 21:27:26 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mRHQ4QmQkePezOb7DFQa9d6hqST/j/W5aK2N8OIk5sk=; b=T1U0Lm7VMPT60w 2vasH2lazR60Qt8saJDQzWQkUrY6V98CpkWdHmj1WCUwjewq1WC4LqQw49rcf/R/WrdpBEm0VRhMZ 4CtHTF76NZwddEznNRdMM2OvNDMLYY8mcodnFpLdPrRdLFJR+mlAjs+glU+z5euNjzgK9IK/vMcKW IFNkT4auextIBdSQM+WZ+JjmAwOD8FY6d/C+479Ny/AaDSSwEPRCZf2N8+eGWWMum6b2c0T8gsiJu BO5kNfraVN0ee/ahl1Wik0zhhCpBg1gUACq3U62l8/OZrIGh6/sYbCT+maGSIAN2MLJrG/mVfIA5E 8Me3IYogJA5DhxycMBaA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUUOk-0006cy-VO; Wed, 05 Dec 2018 10:27:19 +0000 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUUOH-0005zH-JZ for hostap@lists.infradead.org; Wed, 05 Dec 2018 10:26:59 +0000 Received: by mail-ed1-x544.google.com with SMTP id b14so16547546edt.6 for ; Wed, 05 Dec 2018 02:26:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind-be.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gy3BN+9ibP+Z9kCcaS648r3N0PTcjDrsTKKNvLWZe6U=; b=hK/tCe1fkxIkUZ98AGoycBF8cs76lG40rwqK0slxpMks4U47wnkMWX3IHzVBBnSABm I50zLWie/mR64y4C6SQqrggI+BwijF1t1vRT6VWehWaSzeVi7yMvAAQXtilHE1qcyFiH THu1L0L7xybT4Ru5t1QvLen5FcuKevaZtxKsj4ZYcLYwl2jlHheGPmKxm1jYAG1Ms9u+ +FKaS1x/1Yxb0VdFmwH1LarR+TW+H1Lt8f3bbXmmCg3HUgW0yrTpHKLpXaiJc0l3F0OW j5mn14tI0q5PHSbLLBwRng4TvySQda73z7CCvk32aGm21cn1rbSV63o/JzSBXozZfFVi uFfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gy3BN+9ibP+Z9kCcaS648r3N0PTcjDrsTKKNvLWZe6U=; b=rLyzKrjGAmY+r5WHD89JvV/A+ZzrtkJDbwC/pyBmPkQVJ3x0bOin158iZfjnrjoHZg rLiMHUxqubIRJRBG5drR7fdNTpeLOYG6U9bwNq8H1QwLq+NkypWOapx3H2KChekfu6yV E+RX1i5qFrc70O3kky8x3ioibEjqtMPP1PJm97DH+C2W+hf7Zza3V3LlWaLQYusWa6gv NpUK5nLIrPMfBR1sbKT/nqVfLMh1qbpfevIE7G8uKu6PatDdfMinUK4GZWzLUUCwDzeZ OlAJ6LvLvQ+lEvYJjdN7+vBPM4bHcGq3ZJz0web0tJlXe/JOdyNNiljj0eayS12JEcJi fE7g== X-Gm-Message-State: AA+aEWbIWFkE6PXXgaqaVwQqvj9ti2LBhVScz+/F/E/NZeYMwxiMM6aa fbB7aHeW5xHnX7G7ZokBYvcM4cTjzec= X-Google-Smtp-Source: AFSGD/W3a46taXiMecYGDXP8Y2QGQy31rEUS2Pfejz446dRRyDz2EKzEWcQlfGEO4amlNbSAKeZcFg== X-Received: by 2002:a50:ea8d:: with SMTP id d13mr20754106edo.126.1544005597618; Wed, 05 Dec 2018 02:26:37 -0800 (PST) Received: from localhost.localdomain (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id z2sm5438020edd.4.2018.12.05.02.26.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Dec 2018 02:26:37 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: hostap@lists.infradead.org Subject: [PATCH v3 05/12] wpa_supplicant: rename multiap_backhaul_sta -> multi_ap_backhaul_sta Date: Wed, 5 Dec 2018 11:23:55 +0100 Message-Id: <20181205102401.17810-6-arnout@mind.be> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205102401.17810-1-arnout@mind.be> References: <20181205102401.17810-1-arnout@mind.be> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181205_022650_608802_20D6BD42 X-CRM114-Status: GOOD ( 12.71 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:544 listed in] [list.dnswl.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Venkateswara Naralasetty , "Arnout Vandecappelle \(Essensium/Mind\)" Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org To be consistent with the other uses of multi_ap in the code. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Venkateswara Naralasetty --- wpa_supplicant/config.c | 2 +- wpa_supplicant/config_ssid.h | 2 +- wpa_supplicant/events.c | 2 +- wpa_supplicant/sme.c | 2 +- wpa_supplicant/wpa_supplicant.c | 2 +- wpa_supplicant/wpa_supplicant.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index d536f8a2e..4ff93f62f 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2320,7 +2320,7 @@ static const struct parse_data ssid_fields[] = { #endif /* CONFIG_DPP */ { INT_RANGE(owe_group, 0, 65535) }, { INT_RANGE(owe_only, 0, 1) }, - { INT_RANGE(multiap_backhaul_sta, 0, 1) }, + { INT_RANGE(multi_ap_backhaul_sta, 0, 1) }, }; #undef OFFSET diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h index f5d01328e..8d56a1ff1 100644 --- a/wpa_supplicant/config_ssid.h +++ b/wpa_supplicant/config_ssid.h @@ -942,7 +942,7 @@ struct wpa_ssid { * 0 = normal station * 1 = backhaul station */ - int multiap_backhaul_sta; + int multi_ap_backhaul_sta; }; #endif /* CONFIG_SSID_H */ diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 9c1a50b34..b999e2c06 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -2273,7 +2273,7 @@ static void multi_ap_process_assoc_resp(struct wpa_supplicant *wpa_s, const u8 *map_sub_elem, *pos; size_t len; - if (!wpa_s->current_ssid->multiap_backhaul_sta) + if (!wpa_s->current_ssid->multi_ap_backhaul_sta) return; if (ies == NULL) diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c index 650b93559..55df63f8b 100644 --- a/wpa_supplicant/sme.c +++ b/wpa_supplicant/sme.c @@ -1547,7 +1547,7 @@ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, } #endif /* CONFIG_OWE */ - if (wpa_s->conf->ssid->multiap_backhaul_sta) { + if (wpa_s->conf->ssid->multi_ap_backhaul_sta) { if (wpa_s->sme.assoc_req_ie_len + 9 > sizeof(wpa_s->sme.assoc_req_ie)) { wpa_printf(MSG_ERROR, diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index d54638d49..e63fbe5a6 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2823,7 +2823,7 @@ static u8 * wpas_populate_assoc_ies( } #endif /* CONFIG_IEEE80211R */ - if (ssid->multiap_backhaul_sta && ((max_wpa_ie_len - wpa_ie_len) > 9)) + if (ssid->multi_ap_backhaul_sta && ((max_wpa_ie_len - wpa_ie_len) > 9)) wpa_add_multi_ap_info_ie(wpa_ie, &wpa_ie_len); params->wpa_ie = wpa_ie; diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf index 1d5c6a175..1cd09216d 100644 --- a/wpa_supplicant/wpa_supplicant.conf +++ b/wpa_supplicant/wpa_supplicant.conf @@ -1424,7 +1424,7 @@ fast_reauth=1 # Set satation to use as BACKHAUL STA. # default = 0 -# multiap_backhaul_sta = 1 (configure as backhaul STA). +# multi_ap_backhaul_sta = 1 (configure as backhaul STA). # Example blocks: