diff mbox series

[6/6] wpa_supplicant: Replace Master with Main.

Message ID 20210623003125.354448-7-arowa@google.com
State Superseded
Headers show
Series [1/6] wpa_supplicant: Replace MITM with PITM. | expand

Commit Message

Arowa Suliman June 23, 2021, 12:31 a.m. UTC 
Replaced the words Master with the inclusive word Main.

Signed-off-by: Arowa Suliman <arowa@chromium.org>
---
 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(-)

Comments

Brian Norris June 28, 2021, 7:02 p.m. UTC | #1 
On Tue, Jun 22, 2021 at 5:33 PM Arowa Suliman <arowa@chromium.org> wrote:
>
> Replaced the words Master with the inclusive word Main.
>
> Signed-off-by: Arowa Suliman <arowa@chromium.org>
> ---
>  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

There's a small problem with this kind of change: there is no such
'main' branch in this git repository. Jouni would actually need to
switch branch names (or use one as an alias for the other, pushing to
both) for this to be a good patch.

Same applies to the hwsim tests README.

Brian

>  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 mbox series

Patch

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 756c4b6cf..ab3af63c2 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/