From patchwork Tue Jun 22 21:29:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arowa Suliman X-Patchwork-Id: 1495860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=S5CAd7PF; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=j8wCENu2; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G8fh51xCHz9sVm for ; Wed, 23 Jun 2021 07:30:29 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=++msUV05eOzRJnqjdtYQUtzTNl7xdhivsKjuqoPvHH0=; b=S5CAd7PFsPvdLV 7Ap93SQh+amSdUMWXm5jf+n/7VZFM2JsaDtQiGqrEtrGWLMWX0xe+V3Fa1OHBVc5+BecNTwY+Nj6h qa3YN+2Ld+iJlENnQH3Bwd8VY4nye9FXmx01dvxb7qxJWrLnyQKyemoqq+RIA43YFsLiFiZThrq6A M4PQC3I9fh2wQ6idg7SS4mGo55ZQV+PgUQ8LAR6OaQQ+/uyAWHzoMSc1CB1/4ohvAm+tFpmbLWyNM mO0Vy4RO6fslRNHVQkM2/TfNlnVHqpGjrRV0YhjyqMT9NOrADZ75ayyCXTvZx10NhX5jZWQ2c2Uep FORTE4+C+jq8qZl1f02w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lvnxf-008V8X-Ng; Tue, 22 Jun 2021 21:29:35 +0000 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lvnxc-008V7J-IX for hostap@lists.infradead.org; Tue, 22 Jun 2021 21:29:34 +0000 Received: by mail-pf1-x42e.google.com with SMTP id g192so593349pfb.6 for ; Tue, 22 Jun 2021 14:29:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g99O4y9h8SSFZynvkLl7TheGXBofdBN5QC0dGc5Qlto=; b=j8wCENu2yoaZeGauvUbhSxCS34TsKUnxwLz5LyoIqhikmtFsV+UUMA+tHmOMSvnzVl uZKOsl4661ml0q/G5AmgwNrM903Yry9z0K2S0IjHawfjAwyTGkf/hBdruz3F7ljxwC4M yesvCFnmUY6qhdBP0DsUAGKiI5Yj7f8QTwuiY= 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=g99O4y9h8SSFZynvkLl7TheGXBofdBN5QC0dGc5Qlto=; b=fYUI3PuQNpSIpgJCDNVz/lo8H+T8AeJN0jSu+cuTAOkkewa9ds6/c8afahoFbZ0UT/ jAj0TUbxOI04iOipsua8xqIMYvTQPtc/6Pni0+Cg7CaeU5LEohQXY4utxoUodZ2KIPJg 5fWp70kvtYmILQWT6860oGVzjUMbKYzJ8aat1Pthwo7/9zi0+X2JOL9Ek3lpgsBIN2BB fzxE/EnikJoUPyXSTHUOhdbI+0Zbvi7H+fxycpw0fLDEmZctrjj072YsRSNPmNQdMW88 QiqkIuQhAEcjqSY6UeMd/XYRGLoVOI/hR6+O/fvDRjRrVDlJH3YCsQf4DMmLLdf98Wy2 pwzw== X-Gm-Message-State: AOAM530lkGAqMjjH7AYW1ORY790IoLulPXNt2ogMUc72US2Usv1Jp4ll xfsjeLxy6SowemYjWUuc12vqh1AoAeUxeQ== X-Google-Smtp-Source: ABdhPJz8JT9+chTfRg8e5WDHzdIsS5llnwUBFEFZ97ShopSBgcxmSTpiwGT9b3kKgM5YbGIW/jH/jg== X-Received: by 2002:a63:2ac4:: with SMTP id q187mr610218pgq.370.1624397371674; Tue, 22 Jun 2021 14:29:31 -0700 (PDT) Received: from arowa.mtv.corp.google.com ([2620:15c:202:201:fb61:adee:3d97:59de]) by smtp.gmail.com with ESMTPSA id a23sm243939pfn.117.2021.06.22.14.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Jun 2021 14:29:31 -0700 (PDT) From: Arowa Suliman X-Google-Original-From: Arowa Suliman To: hostap@lists.infradead.org Cc: Arowa Suliman Subject: [PATCH] wpa_supplicant: Replace Master with Main. Date: Tue, 22 Jun 2021 14:29:03 -0700 Message-Id: <20210622212908.333196-3-arowa@google.com> X-Mailer: git-send-email 2.32.0.288.g62a8d224e6-goog In-Reply-To: <20210622212908.333196-1-arowa@google.com> References: <20210622212908.333196-1-arowa@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210622_142932_660680_0EBD30EC X-CRM114-Status: GOOD ( 21.97 ) X-Spam-Score: -0.4 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Replaced the words Master with the inclusive word Main. Signed-off-by: Arowa Suliman --- CONTRIBUTIONS | 2 +- doc/doxygen.conf | 2 +- src/common/qca-vendor.h | 4 ++-- src/drivers/driver_hostap.h | 4 ++-- src/p2p/p2p.h | 2 +- src/utils [...] Content analysis details: (-0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:42e listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Replaced the words Master with the inclusive word Main. Signed-off-by: Arowa Suliman --- CONTRIBUTIONS | 2 +- doc/doxygen.conf | 2 +- src/common/qca-vendor.h | 4 ++-- src/drivers/driver_hostap.h | 4 ++-- src/p2p/p2p.h | 2 +- src/utils/pcsc_funcs.c | 4 ++-- tests/hwsim/README | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTIONS b/CONTRIBUTIONS index 1b4caf7ac..b40b29e92 100644 --- a/CONTRIBUTIONS +++ b/CONTRIBUTIONS @@ -37,7 +37,7 @@ without moderation. You can subscribe to the list at this address: http://lists.infradead.org/mailman/listinfo/hostap The message should contain an inlined patch against the current -development branch (i.e., the master branch of +development branch (i.e., the main branch of git://w1.fi/hostap.git). Please make sure the software you use for sending the patch does not corrupt whitespace. If that cannot be fixed for some reason, it is better to include an attached version of the diff --git a/doc/doxygen.conf b/doc/doxygen.conf index 3f0117393..b283b74ba 100644 --- a/doc/doxygen.conf +++ b/doc/doxygen.conf @@ -883,7 +883,7 @@ HHC_LOCATION = # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag # controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). +# it should be included in the main .chm file (NO). GENERATE_CHI = NO diff --git a/src/common/qca-vendor.h b/src/common/qca-vendor.h index ce588cc00..28ee871ca 100644 --- a/src/common/qca-vendor.h +++ b/src/common/qca-vendor.h @@ -551,10 +551,10 @@ enum qca_radiotap_vendor_ids { * sent in the event. * @QCA_NL80211_VENDOR_SUBCMD_MPTA_HELPER_CONFIG: This sub command is used to * improve the success rate of Zigbee joining network. - * Due to PTA master limitation, Zigbee joining network success rate is + * Due to PTA main limitation, Zigbee joining network success rate is * low while WLAN is working. The WLAN driver needs to configure some * parameters including Zigbee state and specific WLAN periods to enhance - * PTA master. All these parameters are delivered by the attributes + * PTA main. All these parameters are delivered by the attributes * defined in enum qca_mpta_helper_vendor_attr. * @QCA_NL80211_VENDOR_SUBCMD_BEACON_REPORTING: This sub command is used to * implement Beacon frame reporting feature. diff --git a/src/drivers/driver_hostap.h b/src/drivers/driver_hostap.h index 4c1e6d69f..ab3d92ca5 100644 --- a/src/drivers/driver_hostap.h +++ b/src/drivers/driver_hostap.h @@ -55,8 +55,8 @@ enum { PRISM2_PARAM_MONITOR_ALLOW_FCSERR = 16, PRISM2_PARAM_HOST_ENCRYPT = 17, PRISM2_PARAM_HOST_DECRYPT = 18, - PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX = 19, - PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX = 20, + PRISM2_PARAM_BUS_MAIN_THRESHOLD_RX = 19, + PRISM2_PARAM_BUS_MAIN_THRESHOLD_TX = 20, PRISM2_PARAM_HOST_ROAMING = 21, PRISM2_PARAM_BCRX_STA_KEY = 22, PRISM2_PARAM_IEEE_802_1X = 23, diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h index f606fbb14..af13b28bd 100644 --- a/src/p2p/p2p.h +++ b/src/p2p/p2p.h @@ -486,7 +486,7 @@ struct p2p_config { * case for this is to include passive-scan channels on devices that may * not know their current location and have configured most channels to * not allow initiation of radition (i.e., another device needs to take - * master responsibilities). + * main responsibilities). */ struct p2p_channels cli_channels; diff --git a/src/utils/pcsc_funcs.c b/src/utils/pcsc_funcs.c index 383ed3ddf..ba3924d06 100644 --- a/src/utils/pcsc_funcs.c +++ b/src/utils/pcsc_funcs.c @@ -90,9 +90,9 @@ /* GSM files * File type in first octet: - * 3F = Master File + * 3F = Main File * 7F = Dedicated File - * 2F = Elementary File under the Master File + * 2F = Elementary File under the Main File * 6F = Elementary File under a Dedicated File */ #define SCARD_FILE_MF 0x3F00 diff --git a/tests/hwsim/README b/tests/hwsim/README index f0d8b18e3..0891e4ed5 100644 --- a/tests/hwsim/README +++ b/tests/hwsim/README @@ -26,7 +26,7 @@ to verify that operations have been performed correctly and that the network connection works in the expected way. These test cases are run automatically against the hostap.git commits -for regression testing and to help in keeping the hostap.git master +for regression testing and to help in keeping the hostap.git main branch in stable state. Results from these tests are available here: http://buildbot.w1.fi/hwsim/