mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 0/3] staging: rtl8712: Tidy-up *Algrthm variables
@ 2024-10-12 16:17 Dominik Karol Piątkowski
  2024-10-12 16:17 ` [PATCH 1/3] staging: rtl8712: Rename AuthAlgrthm variable Dominik Karol Piątkowski
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Dominik Karol Piątkowski @ 2024-10-12 16:17 UTC (permalink / raw)
  To: florian.c.schilhabel, gregkh, ayushtiw0110, dan.carpenter
  Cc: linux-staging, linux-kernel, Dominik Karol Piątkowski

This series renames *Algrthm variables in order to avoid using camel case.

While at it, introduce auth_algorithm macros to increase readability by
replacing hardcoded numbers in assignments and comparisons.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>

Dominik Karol Piątkowski (3):
  staging: rtl8712: Rename AuthAlgrthm variable
  staging: rtl8712: Rename PrivacyAlgrthm variable
  staging: rtl8712: Introduce auth_algorithm macros

 drivers/staging/rtl8712/mlme_linux.c          |  7 ++-
 drivers/staging/rtl8712/rtl871x_cmd.c         |  6 +-
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 61 ++++++++++---------
 drivers/staging/rtl8712/rtl871x_ioctl_set.c   |  9 +--
 drivers/staging/rtl8712/rtl871x_mlme.c        | 23 +++----
 drivers/staging/rtl8712/rtl871x_recv.c        |  2 +-
 drivers/staging/rtl8712/rtl871x_security.h    | 13 ++--
 7 files changed, 65 insertions(+), 56 deletions(-)

-- 
2.34.1



^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/3] staging: rtl8712: Rename AuthAlgrthm variable
  2024-10-12 16:17 [PATCH 0/3] staging: rtl8712: Tidy-up *Algrthm variables Dominik Karol Piątkowski
@ 2024-10-12 16:17 ` Dominik Karol Piątkowski
  2024-10-12 16:17 ` [PATCH 2/3] staging: rtl8712: Rename PrivacyAlgrthm variable Dominik Karol Piątkowski
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Dominik Karol Piątkowski @ 2024-10-12 16:17 UTC (permalink / raw)
  To: florian.c.schilhabel, gregkh, ayushtiw0110, dan.carpenter
  Cc: linux-staging, linux-kernel, Dominik Karol Piątkowski

This patch renames AuthAlgrthm to auth_algorithm in order to avoid
using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/rtl8712/mlme_linux.c          |  4 ++--
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 24 +++++++++----------
 drivers/staging/rtl8712/rtl871x_ioctl_set.c   |  2 +-
 drivers/staging/rtl8712/rtl871x_mlme.c        |  8 +++----
 drivers/staging/rtl8712/rtl871x_recv.c        |  2 +-
 drivers/staging/rtl8712/rtl871x_security.h    |  4 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/rtl8712/mlme_linux.c b/drivers/staging/rtl8712/mlme_linux.c
index 436816d14cdf..041768d46def 100644
--- a/drivers/staging/rtl8712/mlme_linux.c
+++ b/drivers/staging/rtl8712/mlme_linux.c
@@ -92,7 +92,7 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter)
 
 	r8712_indicate_wx_disassoc_event(adapter);
 	netif_carrier_off(adapter->pnetdev);
-	if (adapter->securitypriv.AuthAlgrthm == 2) { /*/802.1x*/
+	if (adapter->securitypriv.auth_algorithm == 2) { /*/802.1x*/
 		/* We have to backup the PMK information for WiFi PMK Caching
 		 * test item. Backup the btkip_countermeasure information.
 		 * When the countermeasure is trigger, the driver have to
@@ -121,7 +121,7 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter)
 	} else { /*reset values in securitypriv*/
 		struct security_priv *sec_priv = &adapter->securitypriv;
 
-		sec_priv->AuthAlgrthm = 0; /*open system*/
+		sec_priv->auth_algorithm = 0; /*open system*/
 		sec_priv->PrivacyAlgrthm = _NO_PRIVACY_;
 		sec_priv->PrivacyKeyIndex = 0;
 		sec_priv->XGrpPrivacy = _NO_PRIVACY_;
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index ebfb1b2f1189..eca6175e232c 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -325,18 +325,18 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value)
 						 Ndis802_11Encryption1Enabled;
 		padapter->securitypriv.ndisauthtype =
 						 Ndis802_11AuthModeAutoSwitch;
-		padapter->securitypriv.AuthAlgrthm = 3;
+		padapter->securitypriv.auth_algorithm = 3;
 	} else if (value & AUTH_ALG_SHARED_KEY) {
 		padapter->securitypriv.ndisencryptstatus =
 						 Ndis802_11Encryption1Enabled;
 		padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeShared;
-		padapter->securitypriv.AuthAlgrthm = 1;
+		padapter->securitypriv.auth_algorithm = 1;
 	} else if (value & AUTH_ALG_OPEN_SYSTEM) {
 		if (padapter->securitypriv.ndisauthtype <
 						 Ndis802_11AuthModeWPAPSK) {
 			padapter->securitypriv.ndisauthtype =
 						 Ndis802_11AuthModeOpen;
-			padapter->securitypriv.AuthAlgrthm = 0;
+			padapter->securitypriv.auth_algorithm = 0;
 		}
 	} else {
 		ret = -EINVAL;
@@ -414,7 +414,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 		}
 		goto exit;
 	}
-	if (padapter->securitypriv.AuthAlgrthm == 2) { /* 802_1x */
+	if (padapter->securitypriv.auth_algorithm == 2) { /* 802_1x */
 		struct sta_info *psta, *pbcmc_sta;
 		struct sta_priv *pstapriv = &padapter->stapriv;
 		struct security_priv *spriv = &padapter->securitypriv;
@@ -472,13 +472,13 @@ static int r871x_set_wpa_ie(struct _adapter *padapter, char *pie,
 		}
 		if (r8712_parse_wpa_ie(buf, ielen, &group_cipher,
 				       &pairwise_cipher) == 0) {
-			padapter->securitypriv.AuthAlgrthm = 2;
+			padapter->securitypriv.auth_algorithm = 2;
 			padapter->securitypriv.ndisauthtype =
 				  Ndis802_11AuthModeWPAPSK;
 		}
 		if (r8712_parse_wpa2_ie(buf, ielen, &group_cipher,
 					&pairwise_cipher) == 0) {
-			padapter->securitypriv.AuthAlgrthm = 2;
+			padapter->securitypriv.auth_algorithm = 2;
 			padapter->securitypriv.ndisauthtype =
 				  Ndis802_11AuthModeWPA2PSK;
 		}
@@ -1450,7 +1450,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 				 Ndis802_11EncryptionDisabled;
 		padapter->securitypriv.PrivacyAlgrthm = _NO_PRIVACY_;
 		padapter->securitypriv.XGrpPrivacy = _NO_PRIVACY_;
-		padapter->securitypriv.AuthAlgrthm = 0; /* open system */
+		padapter->securitypriv.auth_algorithm = 0; /* open system */
 		authmode = Ndis802_11AuthModeOpen;
 		padapter->securitypriv.ndisauthtype = authmode;
 		return 0;
@@ -1469,7 +1469,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 		netdev_info(dev, "r8712u: %s: IW_ENCODE_OPEN\n", __func__);
 		padapter->securitypriv.ndisencryptstatus =
 				 Ndis802_11Encryption1Enabled;
-		padapter->securitypriv.AuthAlgrthm = 0; /* open system */
+		padapter->securitypriv.auth_algorithm = 0; /* open system */
 		padapter->securitypriv.PrivacyAlgrthm = _NO_PRIVACY_;
 		padapter->securitypriv.XGrpPrivacy = _NO_PRIVACY_;
 		authmode = Ndis802_11AuthModeOpen;
@@ -1479,7 +1479,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 				"r8712u: %s: IW_ENCODE_RESTRICTED\n", __func__);
 		padapter->securitypriv.ndisencryptstatus =
 				 Ndis802_11Encryption1Enabled;
-		padapter->securitypriv.AuthAlgrthm = 1; /* shared system */
+		padapter->securitypriv.auth_algorithm = 1; /* shared system */
 		padapter->securitypriv.PrivacyAlgrthm = _WEP40_;
 		padapter->securitypriv.XGrpPrivacy = _WEP40_;
 		authmode = Ndis802_11AuthModeShared;
@@ -1487,7 +1487,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 	} else {
 		padapter->securitypriv.ndisencryptstatus =
 				 Ndis802_11Encryption1Enabled;
-		padapter->securitypriv.AuthAlgrthm = 0; /* open system */
+		padapter->securitypriv.auth_algorithm = 0; /* open system */
 		padapter->securitypriv.PrivacyAlgrthm = _NO_PRIVACY_;
 		padapter->securitypriv.XGrpPrivacy = _NO_PRIVACY_;
 		authmode = Ndis802_11AuthModeOpen;
@@ -1672,7 +1672,7 @@ static int r871x_wx_set_auth(struct net_device *dev,
 				  _NO_PRIVACY_;
 			padapter->securitypriv.XGrpPrivacy =
 				  _NO_PRIVACY_;
-			padapter->securitypriv.AuthAlgrthm = 0;
+			padapter->securitypriv.auth_algorithm = 0;
 			padapter->securitypriv.ndisauthtype =
 				  Ndis802_11AuthModeOpen;
 		}
@@ -2017,7 +2017,7 @@ static int wpa_set_param(struct net_device *dev, u8 name, u32 value)
 
 	switch (name) {
 	case IEEE_PARAM_WPA_ENABLED:
-		padapter->securitypriv.AuthAlgrthm = 2; /* 802.1x */
+		padapter->securitypriv.auth_algorithm = 2; /* 802.1x */
 		switch ((value) & 0xff) {
 		case 1: /* WPA */
 			padapter->securitypriv.ndisauthtype =
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.c b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
index b335799b2ad5..9eb67db36ecb 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_set.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
@@ -318,7 +318,7 @@ u8 r8712_set_802_11_authentication_mode(struct _adapter *padapter,
 
 	psecuritypriv->ndisauthtype = authmode;
 	if (psecuritypriv->ndisauthtype > 3)
-		psecuritypriv->AuthAlgrthm = 2; /* 802.1x */
+		psecuritypriv->auth_algorithm = 2; /* 802.1x */
 	if (r8712_set_auth(padapter, psecuritypriv))
 		ret = false;
 	else
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index a80c99554273..876788b80953 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -768,7 +768,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
 					ptarget_sta->aid = pnetwork->join_res;
 					ptarget_sta->qos_option = 1;
 					ptarget_sta->mac_id = 5;
-					if (adapter->securitypriv.AuthAlgrthm == 2) {
+					if (adapter->securitypriv.auth_algorithm == 2) {
 						adapter->securitypriv.binstallGrpkey = false;
 						adapter->securitypriv.busetkipkey = false;
 						adapter->securitypriv.bgrpkey_handshake = false;
@@ -869,7 +869,7 @@ void r8712_stassoc_event_callback(struct _adapter *adapter, u8 *pbuf)
 	psta->mac_id = le32_to_cpu(pstassoc->cam_id);
 	/* psta->aid = (uint)pstassoc->cam_id; */
 
-	if (adapter->securitypriv.AuthAlgrthm == 2)
+	if (adapter->securitypriv.auth_algorithm == 2)
 		psta->XPrivacy = adapter->securitypriv.PrivacyAlgrthm;
 	psta->ieee8021x_blocked = false;
 	spin_lock_irqsave(&pmlmepriv->lock, irqL);
@@ -1131,7 +1131,7 @@ int r8712_set_auth(struct _adapter *adapter,
 		kfree(pcmd);
 		return -ENOMEM;
 	}
-	psetauthparm->mode = (u8)psecuritypriv->AuthAlgrthm;
+	psetauthparm->mode = (u8)psecuritypriv->auth_algorithm;
 	pcmd->cmdcode = _SetAuth_CMD_;
 	pcmd->parmbuf = (unsigned char *)psetauthparm;
 	pcmd->cmdsz = sizeof(struct setauth_parm);
@@ -1160,7 +1160,7 @@ int r8712_set_key(struct _adapter *adapter,
 		ret = -ENOMEM;
 		goto err_free_cmd;
 	}
-	if (psecuritypriv->AuthAlgrthm == 2) { /* 802.1X */
+	if (psecuritypriv->auth_algorithm == 2) { /* 802.1X */
 		psetkeyparm->algorithm =
 			 (u8)psecuritypriv->XGrpPrivacy;
 	} else { /* WEP */
diff --git a/drivers/staging/rtl8712/rtl871x_recv.c b/drivers/staging/rtl8712/rtl871x_recv.c
index 0c305bd19693..3fb5cd746273 100644
--- a/drivers/staging/rtl8712/rtl871x_recv.c
+++ b/drivers/staging/rtl8712/rtl871x_recv.c
@@ -240,7 +240,7 @@ union recv_frame *r8712_portctrl(struct _adapter *adapter,
 	pfhdr = &precv_frame->u.hdr;
 	psta_addr = pfhdr->attrib.ta;
 	psta = r8712_get_stainfo(pstapriv, psta_addr);
-	auth_alg = adapter->securitypriv.AuthAlgrthm;
+	auth_alg = adapter->securitypriv.auth_algorithm;
 	if (auth_alg == 2) {
 		/* get ether_type */
 		ptr = ptr + pfhdr->attrib.hdrlen + LLC_HEADER_SIZE;
diff --git a/drivers/staging/rtl8712/rtl871x_security.h b/drivers/staging/rtl8712/rtl871x_security.h
index 8461b7f05359..b498ce4ddd34 100644
--- a/drivers/staging/rtl8712/rtl871x_security.h
+++ b/drivers/staging/rtl8712/rtl871x_security.h
@@ -77,7 +77,7 @@ struct RT_PMKID_LIST {
 };
 
 struct security_priv {
-	u32 AuthAlgrthm;		/* 802.11 auth, could be open, shared,
+	u32 auth_algorithm;		/* 802.11 auth, could be open, shared,
 					 * 8021x and authswitch
 					 */
 	u32 PrivacyAlgrthm;		/* This specify the privacy for shared
@@ -139,7 +139,7 @@ struct security_priv {
 
 #define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst) \
 do { \
-	switch (psecuritypriv->AuthAlgrthm) { \
+	switch (psecuritypriv->auth_algorithm) { \
 	case 0: \
 	case 1: \
 	case 3: \
-- 
2.34.1



^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/3] staging: rtl8712: Rename PrivacyAlgrthm variable
  2024-10-12 16:17 [PATCH 0/3] staging: rtl8712: Tidy-up *Algrthm variables Dominik Karol Piątkowski
  2024-10-12 16:17 ` [PATCH 1/3] staging: rtl8712: Rename AuthAlgrthm variable Dominik Karol Piątkowski
@ 2024-10-12 16:17 ` Dominik Karol Piątkowski
  2024-10-12 16:17 ` [PATCH 3/3] staging: rtl8712: Introduce auth_algorithm macros Dominik Karol Piątkowski
  2024-10-13  9:09 ` [PATCH 0/3] staging: rtl8712: Tidy-up *Algrthm variables Philipp Hortmann
  3 siblings, 0 replies; 5+ messages in thread
From: Dominik Karol Piątkowski @ 2024-10-12 16:17 UTC (permalink / raw)
  To: florian.c.schilhabel, gregkh, ayushtiw0110, dan.carpenter
  Cc: linux-staging, linux-kernel, Dominik Karol Piątkowski

This patch renames PrivacyAlgrthm to privacy_algorithm in order to avoid
using camel case.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/rtl8712/mlme_linux.c          |  2 +-
 drivers/staging/rtl8712/rtl871x_cmd.c         |  6 ++--
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 36 +++++++++----------
 drivers/staging/rtl8712/rtl871x_ioctl_set.c   |  6 ++--
 drivers/staging/rtl8712/rtl871x_mlme.c        | 14 ++++----
 drivers/staging/rtl8712/rtl871x_security.h    |  4 +--
 6 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/drivers/staging/rtl8712/mlme_linux.c b/drivers/staging/rtl8712/mlme_linux.c
index 041768d46def..fa6b0adec746 100644
--- a/drivers/staging/rtl8712/mlme_linux.c
+++ b/drivers/staging/rtl8712/mlme_linux.c
@@ -122,7 +122,7 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter)
 		struct security_priv *sec_priv = &adapter->securitypriv;
 
 		sec_priv->auth_algorithm = 0; /*open system*/
-		sec_priv->PrivacyAlgrthm = _NO_PRIVACY_;
+		sec_priv->privacy_algorithm = _NO_PRIVACY_;
 		sec_priv->PrivacyKeyIndex = 0;
 		sec_priv->XGrpPrivacy = _NO_PRIVACY_;
 		sec_priv->XGrpKeyid = 1;
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index 218836128e8f..21e00ec83a19 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -407,8 +407,8 @@ int r8712_joinbss_cmd(struct _adapter  *padapter, struct wlan_network *pnetwork)
 		 * to avoid some IOT issues, especially for Realtek 8192u
 		 * SoftAP.
 		 */
-		if ((padapter->securitypriv.PrivacyAlgrthm != _WEP40_) &&
-		    (padapter->securitypriv.PrivacyAlgrthm != _WEP104_)) {
+		if ((padapter->securitypriv.privacy_algorithm != _WEP40_) &&
+		    (padapter->securitypriv.privacy_algorithm != _WEP104_)) {
 			/* restructure_ht_ie */
 			r8712_restructure_ht_ie(padapter,
 						&pnetwork->network.IEs[0],
@@ -522,7 +522,7 @@ void r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key)
 	ether_addr_copy(psetstakey_para->addr, sta->hwaddr);
 	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
 		psetstakey_para->algorithm = (unsigned char)
-					    psecuritypriv->PrivacyAlgrthm;
+					    psecuritypriv->privacy_algorithm;
 	else
 		GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, false);
 	if (unicast_key)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index eca6175e232c..f832501cc196 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -370,7 +370,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 		netdev_info(dev, "r8712u: %s: crypt.alg = WEP\n", __func__);
 		padapter->securitypriv.ndisencryptstatus =
 			     Ndis802_11Encryption1Enabled;
-		padapter->securitypriv.PrivacyAlgrthm = _WEP40_;
+		padapter->securitypriv.privacy_algorithm = _WEP40_;
 		padapter->securitypriv.XGrpPrivacy = _WEP40_;
 		wep_key_idx = param->u.crypt.idx;
 		wep_key_len = param->u.crypt.key_len;
@@ -387,7 +387,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 		pwep->Length = wep_key_len +
 			offsetof(struct NDIS_802_11_WEP, KeyMaterial);
 		if (wep_key_len == 13) {
-			padapter->securitypriv.PrivacyAlgrthm = _WEP104_;
+			padapter->securitypriv.privacy_algorithm = _WEP104_;
 			padapter->securitypriv.XGrpPrivacy = _WEP104_;
 		}
 		pwep->KeyIndex = wep_key_idx;
@@ -397,7 +397,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 			if (r8712_set_802_11_add_wep(padapter, pwep))
 				ret = -EOPNOTSUPP;
 		} else {
-			/* don't update "psecuritypriv->PrivacyAlgrthm" and
+			/* don't update "psecuritypriv->privacy_algorithm" and
 			 * "psecuritypriv->PrivacyKeyIndex=keyid", but can
 			 * r8712_set_key to fw/cam
 			 */
@@ -429,7 +429,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 				    Ndis802_11Encryption2Enabled ||
 				    spriv->ndisencryptstatus ==
 				    Ndis802_11Encryption3Enabled)
-					psta->XPrivacy = spriv->PrivacyAlgrthm;
+					psta->XPrivacy = spriv->privacy_algorithm;
 				if (param->u.crypt.set_tx == 1)
 					handle_pairwise_key(psta, param,
 							    padapter);
@@ -444,7 +444,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 				    spriv->ndisencryptstatus ==
 				    Ndis802_11Encryption3Enabled)
 					pbcmc_sta->XPrivacy =
-						spriv->PrivacyAlgrthm;
+						spriv->privacy_algorithm;
 			}
 		}
 	}
@@ -506,23 +506,23 @@ static int r871x_set_wpa_ie(struct _adapter *padapter, char *pie,
 		}
 		switch (pairwise_cipher) {
 		case WPA_CIPHER_NONE:
-			padapter->securitypriv.PrivacyAlgrthm = _NO_PRIVACY_;
+			padapter->securitypriv.privacy_algorithm = _NO_PRIVACY_;
 			padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
 			break;
 		case WPA_CIPHER_WEP40:
-			padapter->securitypriv.PrivacyAlgrthm = _WEP40_;
+			padapter->securitypriv.privacy_algorithm = _WEP40_;
 			padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
 			break;
 		case WPA_CIPHER_TKIP:
-			padapter->securitypriv.PrivacyAlgrthm = _TKIP_;
+			padapter->securitypriv.privacy_algorithm = _TKIP_;
 			padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled;
 			break;
 		case WPA_CIPHER_CCMP:
-			padapter->securitypriv.PrivacyAlgrthm = _AES_;
+			padapter->securitypriv.privacy_algorithm = _AES_;
 			padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled;
 			break;
 		case WPA_CIPHER_WEP104:
-			padapter->securitypriv.PrivacyAlgrthm = _WEP104_;
+			padapter->securitypriv.privacy_algorithm = _WEP104_;
 			padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
 			break;
 		}
@@ -1448,7 +1448,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 		netdev_info(dev, "r8712u: %s: EncryptionDisabled\n", __func__);
 		padapter->securitypriv.ndisencryptstatus =
 				 Ndis802_11EncryptionDisabled;
-		padapter->securitypriv.PrivacyAlgrthm = _NO_PRIVACY_;
+		padapter->securitypriv.privacy_algorithm = _NO_PRIVACY_;
 		padapter->securitypriv.XGrpPrivacy = _NO_PRIVACY_;
 		padapter->securitypriv.auth_algorithm = 0; /* open system */
 		authmode = Ndis802_11AuthModeOpen;
@@ -1470,7 +1470,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 		padapter->securitypriv.ndisencryptstatus =
 				 Ndis802_11Encryption1Enabled;
 		padapter->securitypriv.auth_algorithm = 0; /* open system */
-		padapter->securitypriv.PrivacyAlgrthm = _NO_PRIVACY_;
+		padapter->securitypriv.privacy_algorithm = _NO_PRIVACY_;
 		padapter->securitypriv.XGrpPrivacy = _NO_PRIVACY_;
 		authmode = Ndis802_11AuthModeOpen;
 		padapter->securitypriv.ndisauthtype = authmode;
@@ -1480,7 +1480,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 		padapter->securitypriv.ndisencryptstatus =
 				 Ndis802_11Encryption1Enabled;
 		padapter->securitypriv.auth_algorithm = 1; /* shared system */
-		padapter->securitypriv.PrivacyAlgrthm = _WEP40_;
+		padapter->securitypriv.privacy_algorithm = _WEP40_;
 		padapter->securitypriv.XGrpPrivacy = _WEP40_;
 		authmode = Ndis802_11AuthModeShared;
 		padapter->securitypriv.ndisauthtype = authmode;
@@ -1488,7 +1488,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 		padapter->securitypriv.ndisencryptstatus =
 				 Ndis802_11Encryption1Enabled;
 		padapter->securitypriv.auth_algorithm = 0; /* open system */
-		padapter->securitypriv.PrivacyAlgrthm = _NO_PRIVACY_;
+		padapter->securitypriv.privacy_algorithm = _NO_PRIVACY_;
 		padapter->securitypriv.XGrpPrivacy = _NO_PRIVACY_;
 		authmode = Ndis802_11AuthModeOpen;
 		padapter->securitypriv.ndisauthtype = authmode;
@@ -1506,15 +1506,15 @@ static int r8711_wx_set_enc(struct net_device *dev,
 			padapter->securitypriv.PrivacyKeyIndex = key;
 			switch (padapter->securitypriv.DefKeylen[key]) {
 			case 5:
-				padapter->securitypriv.PrivacyAlgrthm =
+				padapter->securitypriv.privacy_algorithm =
 						 _WEP40_;
 				break;
 			case 13:
-				padapter->securitypriv.PrivacyAlgrthm =
+				padapter->securitypriv.privacy_algorithm =
 						 _WEP104_;
 				break;
 			default:
-				padapter->securitypriv.PrivacyAlgrthm =
+				padapter->securitypriv.privacy_algorithm =
 						 _NO_PRIVACY_;
 				break;
 			}
@@ -1668,7 +1668,7 @@ static int r871x_wx_set_auth(struct net_device *dev,
 		if (paramval) {
 			padapter->securitypriv.ndisencryptstatus =
 				   Ndis802_11EncryptionDisabled;
-			padapter->securitypriv.PrivacyAlgrthm =
+			padapter->securitypriv.privacy_algorithm =
 				  _NO_PRIVACY_;
 			padapter->securitypriv.XGrpPrivacy =
 				  _NO_PRIVACY_;
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.c b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
index 9eb67db36ecb..569d26425250 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_set.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
@@ -337,13 +337,13 @@ int r8712_set_802_11_add_wep(struct _adapter *padapter,
 		return -EINVAL;
 	switch (wep->KeyLength) {
 	case 5:
-		psecuritypriv->PrivacyAlgrthm = _WEP40_;
+		psecuritypriv->privacy_algorithm = _WEP40_;
 		break;
 	case 13:
-		psecuritypriv->PrivacyAlgrthm = _WEP104_;
+		psecuritypriv->privacy_algorithm = _WEP104_;
 		break;
 	default:
-		psecuritypriv->PrivacyAlgrthm = _NO_PRIVACY_;
+		psecuritypriv->privacy_algorithm = _NO_PRIVACY_;
 		break;
 	}
 	memcpy(psecuritypriv->DefKey[keyid].skey, &wep->KeyMaterial,
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 876788b80953..66f9fc51c147 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -219,10 +219,10 @@ int r8712_is_same_ibss(struct _adapter *adapter, struct wlan_network *pnetwork)
 	int ret = true;
 	struct security_priv *psecuritypriv = &adapter->securitypriv;
 
-	if ((psecuritypriv->PrivacyAlgrthm != _NO_PRIVACY_) &&
+	if ((psecuritypriv->privacy_algorithm != _NO_PRIVACY_) &&
 		    (pnetwork->network.Privacy == cpu_to_le32(0)))
 		ret = false;
-	else if ((psecuritypriv->PrivacyAlgrthm == _NO_PRIVACY_) &&
+	else if ((psecuritypriv->privacy_algorithm == _NO_PRIVACY_) &&
 		 (pnetwork->network.Privacy == cpu_to_le32(1)))
 		ret = false;
 	else
@@ -426,7 +426,7 @@ static int is_desired_network(struct _adapter *adapter,
 			return true;
 		return false;
 	}
-	if ((psecuritypriv->PrivacyAlgrthm != _NO_PRIVACY_) &&
+	if ((psecuritypriv->privacy_algorithm != _NO_PRIVACY_) &&
 		    (pnetwork->network.Privacy == 0))
 		bselected = false;
 	if (check_fwstate(&adapter->mlmepriv, WIFI_ADHOC_STATE)) {
@@ -774,7 +774,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
 						adapter->securitypriv.bgrpkey_handshake = false;
 						ptarget_sta->ieee8021x_blocked = true;
 						ptarget_sta->XPrivacy =
-							adapter->securitypriv.PrivacyAlgrthm;
+							adapter->securitypriv.privacy_algorithm;
 						memset((u8 *)&ptarget_sta->x_UncstKey,
 							0,
 							sizeof(union Keytype));
@@ -870,7 +870,7 @@ void r8712_stassoc_event_callback(struct _adapter *adapter, u8 *pbuf)
 	/* psta->aid = (uint)pstassoc->cam_id; */
 
 	if (adapter->securitypriv.auth_algorithm == 2)
-		psta->XPrivacy = adapter->securitypriv.PrivacyAlgrthm;
+		psta->XPrivacy = adapter->securitypriv.privacy_algorithm;
 	psta->ieee8021x_blocked = false;
 	spin_lock_irqsave(&pmlmepriv->lock, irqL);
 	if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) ||
@@ -1165,7 +1165,7 @@ int r8712_set_key(struct _adapter *adapter,
 			 (u8)psecuritypriv->XGrpPrivacy;
 	} else { /* WEP */
 		psetkeyparm->algorithm =
-			 (u8)psecuritypriv->PrivacyAlgrthm;
+			 (u8)psecuritypriv->privacy_algorithm;
 	}
 	psetkeyparm->keyid = (u8)keyid;
 
@@ -1542,7 +1542,7 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter)
 	struct security_priv	*psecuritypriv = &adapter->securitypriv;
 	struct wlan_network	*cur_network = &adapter->mlmepriv.cur_network;
 
-	pdev_network->Privacy = cpu_to_le32(psecuritypriv->PrivacyAlgrthm
+	pdev_network->Privacy = cpu_to_le32(psecuritypriv->privacy_algorithm
 					    > 0 ? 1 : 0); /* adhoc no 802.1x */
 	pdev_network->Rssi = 0;
 	switch (pregistrypriv->wireless_mode) {
diff --git a/drivers/staging/rtl8712/rtl871x_security.h b/drivers/staging/rtl8712/rtl871x_security.h
index b498ce4ddd34..5727a84838d3 100644
--- a/drivers/staging/rtl8712/rtl871x_security.h
+++ b/drivers/staging/rtl8712/rtl871x_security.h
@@ -80,7 +80,7 @@ struct security_priv {
 	u32 auth_algorithm;		/* 802.11 auth, could be open, shared,
 					 * 8021x and authswitch
 					 */
-	u32 PrivacyAlgrthm;		/* This specify the privacy for shared
+	u32 privacy_algorithm;		/* This specify the privacy for shared
 					 * auth. algorithm.
 					 */
 	u32 PrivacyKeyIndex;		/* this is only valid for legendary
@@ -143,7 +143,7 @@ do { \
 	case 0: \
 	case 1: \
 	case 3: \
-		encry_algo = (u8)psecuritypriv->PrivacyAlgrthm; \
+		encry_algo = (u8)psecuritypriv->privacy_algorithm; \
 		break; \
 	case 2: \
 		if (bmcst) \
-- 
2.34.1



^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 3/3] staging: rtl8712: Introduce auth_algorithm macros
  2024-10-12 16:17 [PATCH 0/3] staging: rtl8712: Tidy-up *Algrthm variables Dominik Karol Piątkowski
  2024-10-12 16:17 ` [PATCH 1/3] staging: rtl8712: Rename AuthAlgrthm variable Dominik Karol Piątkowski
  2024-10-12 16:17 ` [PATCH 2/3] staging: rtl8712: Rename PrivacyAlgrthm variable Dominik Karol Piątkowski
@ 2024-10-12 16:17 ` Dominik Karol Piątkowski
  2024-10-13  9:09 ` [PATCH 0/3] staging: rtl8712: Tidy-up *Algrthm variables Philipp Hortmann
  3 siblings, 0 replies; 5+ messages in thread
From: Dominik Karol Piątkowski @ 2024-10-12 16:17 UTC (permalink / raw)
  To: florian.c.schilhabel, gregkh, ayushtiw0110, dan.carpenter
  Cc: linux-staging, linux-kernel, Dominik Karol Piątkowski

Currently, auth_algorithm is assigned/compared to using hardcoded
numbers. Some of the lines are commented, some of them are not.

This patch introduces macros that replace numeric assignments and
comparisons of auth_algorithm, increasing readability.

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
---
 drivers/staging/rtl8712/mlme_linux.c          |  5 ++--
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 25 ++++++++++---------
 drivers/staging/rtl8712/rtl871x_ioctl_set.c   |  3 ++-
 drivers/staging/rtl8712/rtl871x_mlme.c        |  7 +++---
 drivers/staging/rtl8712/rtl871x_security.h    |  5 ++++
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/rtl8712/mlme_linux.c b/drivers/staging/rtl8712/mlme_linux.c
index fa6b0adec746..fcd2e0a9487a 100644
--- a/drivers/staging/rtl8712/mlme_linux.c
+++ b/drivers/staging/rtl8712/mlme_linux.c
@@ -19,6 +19,7 @@
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "mlme_osdep.h"
+#include "rtl871x_security.h"
 
 static void sitesurvey_ctrl_handler(struct timer_list *t)
 {
@@ -92,7 +93,7 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter)
 
 	r8712_indicate_wx_disassoc_event(adapter);
 	netif_carrier_off(adapter->pnetdev);
-	if (adapter->securitypriv.auth_algorithm == 2) { /*/802.1x*/
+	if (adapter->securitypriv.auth_algorithm == _AUTH_8021x_) {
 		/* We have to backup the PMK information for WiFi PMK Caching
 		 * test item. Backup the btkip_countermeasure information.
 		 * When the countermeasure is trigger, the driver have to
@@ -121,7 +122,7 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter)
 	} else { /*reset values in securitypriv*/
 		struct security_priv *sec_priv = &adapter->securitypriv;
 
-		sec_priv->auth_algorithm = 0; /*open system*/
+		sec_priv->auth_algorithm = _AUTH_OPEN_SYSTEM_;
 		sec_priv->privacy_algorithm = _NO_PRIVACY_;
 		sec_priv->PrivacyKeyIndex = 0;
 		sec_priv->XGrpPrivacy = _NO_PRIVACY_;
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index f832501cc196..832c6c64aa68 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -26,6 +26,7 @@
 #include "rtl871x_ioctl.h"
 #include "rtl871x_ioctl_set.h"
 #include "rtl871x_mp_ioctl.h"
+#include "rtl871x_security.h"
 #include "mlme_osdep.h"
 #include <linux/wireless.h>
 #include <linux/module.h>
@@ -325,18 +326,18 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value)
 						 Ndis802_11Encryption1Enabled;
 		padapter->securitypriv.ndisauthtype =
 						 Ndis802_11AuthModeAutoSwitch;
-		padapter->securitypriv.auth_algorithm = 3;
+		padapter->securitypriv.auth_algorithm = _AUTH_AUTHSWITCH_;
 	} else if (value & AUTH_ALG_SHARED_KEY) {
 		padapter->securitypriv.ndisencryptstatus =
 						 Ndis802_11Encryption1Enabled;
 		padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeShared;
-		padapter->securitypriv.auth_algorithm = 1;
+		padapter->securitypriv.auth_algorithm = _AUTH_SHARED_SYSTEM_;
 	} else if (value & AUTH_ALG_OPEN_SYSTEM) {
 		if (padapter->securitypriv.ndisauthtype <
 						 Ndis802_11AuthModeWPAPSK) {
 			padapter->securitypriv.ndisauthtype =
 						 Ndis802_11AuthModeOpen;
-			padapter->securitypriv.auth_algorithm = 0;
+			padapter->securitypriv.auth_algorithm = _AUTH_OPEN_SYSTEM_;
 		}
 	} else {
 		ret = -EINVAL;
@@ -414,7 +415,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 		}
 		goto exit;
 	}
-	if (padapter->securitypriv.auth_algorithm == 2) { /* 802_1x */
+	if (padapter->securitypriv.auth_algorithm == _AUTH_8021x_) {
 		struct sta_info *psta, *pbcmc_sta;
 		struct sta_priv *pstapriv = &padapter->stapriv;
 		struct security_priv *spriv = &padapter->securitypriv;
@@ -472,13 +473,13 @@ static int r871x_set_wpa_ie(struct _adapter *padapter, char *pie,
 		}
 		if (r8712_parse_wpa_ie(buf, ielen, &group_cipher,
 				       &pairwise_cipher) == 0) {
-			padapter->securitypriv.auth_algorithm = 2;
+			padapter->securitypriv.auth_algorithm = _AUTH_8021x_;
 			padapter->securitypriv.ndisauthtype =
 				  Ndis802_11AuthModeWPAPSK;
 		}
 		if (r8712_parse_wpa2_ie(buf, ielen, &group_cipher,
 					&pairwise_cipher) == 0) {
-			padapter->securitypriv.auth_algorithm = 2;
+			padapter->securitypriv.auth_algorithm = _AUTH_8021x_;
 			padapter->securitypriv.ndisauthtype =
 				  Ndis802_11AuthModeWPA2PSK;
 		}
@@ -1450,7 +1451,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 				 Ndis802_11EncryptionDisabled;
 		padapter->securitypriv.privacy_algorithm = _NO_PRIVACY_;
 		padapter->securitypriv.XGrpPrivacy = _NO_PRIVACY_;
-		padapter->securitypriv.auth_algorithm = 0; /* open system */
+		padapter->securitypriv.auth_algorithm = _AUTH_OPEN_SYSTEM_;
 		authmode = Ndis802_11AuthModeOpen;
 		padapter->securitypriv.ndisauthtype = authmode;
 		return 0;
@@ -1469,7 +1470,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 		netdev_info(dev, "r8712u: %s: IW_ENCODE_OPEN\n", __func__);
 		padapter->securitypriv.ndisencryptstatus =
 				 Ndis802_11Encryption1Enabled;
-		padapter->securitypriv.auth_algorithm = 0; /* open system */
+		padapter->securitypriv.auth_algorithm = _AUTH_OPEN_SYSTEM_;
 		padapter->securitypriv.privacy_algorithm = _NO_PRIVACY_;
 		padapter->securitypriv.XGrpPrivacy = _NO_PRIVACY_;
 		authmode = Ndis802_11AuthModeOpen;
@@ -1479,7 +1480,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 				"r8712u: %s: IW_ENCODE_RESTRICTED\n", __func__);
 		padapter->securitypriv.ndisencryptstatus =
 				 Ndis802_11Encryption1Enabled;
-		padapter->securitypriv.auth_algorithm = 1; /* shared system */
+		padapter->securitypriv.auth_algorithm = _AUTH_SHARED_SYSTEM_;
 		padapter->securitypriv.privacy_algorithm = _WEP40_;
 		padapter->securitypriv.XGrpPrivacy = _WEP40_;
 		authmode = Ndis802_11AuthModeShared;
@@ -1487,7 +1488,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
 	} else {
 		padapter->securitypriv.ndisencryptstatus =
 				 Ndis802_11Encryption1Enabled;
-		padapter->securitypriv.auth_algorithm = 0; /* open system */
+		padapter->securitypriv.auth_algorithm = _AUTH_OPEN_SYSTEM_;
 		padapter->securitypriv.privacy_algorithm = _NO_PRIVACY_;
 		padapter->securitypriv.XGrpPrivacy = _NO_PRIVACY_;
 		authmode = Ndis802_11AuthModeOpen;
@@ -1672,7 +1673,7 @@ static int r871x_wx_set_auth(struct net_device *dev,
 				  _NO_PRIVACY_;
 			padapter->securitypriv.XGrpPrivacy =
 				  _NO_PRIVACY_;
-			padapter->securitypriv.auth_algorithm = 0;
+			padapter->securitypriv.auth_algorithm = _AUTH_OPEN_SYSTEM_;
 			padapter->securitypriv.ndisauthtype =
 				  Ndis802_11AuthModeOpen;
 		}
@@ -2017,7 +2018,7 @@ static int wpa_set_param(struct net_device *dev, u8 name, u32 value)
 
 	switch (name) {
 	case IEEE_PARAM_WPA_ENABLED:
-		padapter->securitypriv.auth_algorithm = 2; /* 802.1x */
+		padapter->securitypriv.auth_algorithm = _AUTH_8021x_;
 		switch ((value) & 0xff) {
 		case 1: /* WPA */
 			padapter->securitypriv.ndisauthtype =
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.c b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
index 569d26425250..9ddfe7a1d715 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_set.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
@@ -19,6 +19,7 @@
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "rtl871x_ioctl_set.h"
+#include "rtl871x_security.h"
 #include "usb_osintf.h"
 #include "usb_ops.h"
 
@@ -318,7 +319,7 @@ u8 r8712_set_802_11_authentication_mode(struct _adapter *padapter,
 
 	psecuritypriv->ndisauthtype = authmode;
 	if (psecuritypriv->ndisauthtype > 3)
-		psecuritypriv->auth_algorithm = 2; /* 802.1x */
+		psecuritypriv->auth_algorithm = _AUTH_8021x_;
 	if (r8712_set_auth(padapter, psecuritypriv))
 		ret = false;
 	else
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 66f9fc51c147..1ca94e90dfe6 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -23,6 +23,7 @@
 #include "recv_osdep.h"
 #include "xmit_osdep.h"
 #include "mlme_osdep.h"
+#include "rtl871x_security.h"
 #include "sta_info.h"
 #include "wifi.h"
 #include "wlan_bssdef.h"
@@ -768,7 +769,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
 					ptarget_sta->aid = pnetwork->join_res;
 					ptarget_sta->qos_option = 1;
 					ptarget_sta->mac_id = 5;
-					if (adapter->securitypriv.auth_algorithm == 2) {
+					if (adapter->securitypriv.auth_algorithm == _AUTH_8021x_) {
 						adapter->securitypriv.binstallGrpkey = false;
 						adapter->securitypriv.busetkipkey = false;
 						adapter->securitypriv.bgrpkey_handshake = false;
@@ -869,7 +870,7 @@ void r8712_stassoc_event_callback(struct _adapter *adapter, u8 *pbuf)
 	psta->mac_id = le32_to_cpu(pstassoc->cam_id);
 	/* psta->aid = (uint)pstassoc->cam_id; */
 
-	if (adapter->securitypriv.auth_algorithm == 2)
+	if (adapter->securitypriv.auth_algorithm == _AUTH_8021x_)
 		psta->XPrivacy = adapter->securitypriv.privacy_algorithm;
 	psta->ieee8021x_blocked = false;
 	spin_lock_irqsave(&pmlmepriv->lock, irqL);
@@ -1160,7 +1161,7 @@ int r8712_set_key(struct _adapter *adapter,
 		ret = -ENOMEM;
 		goto err_free_cmd;
 	}
-	if (psecuritypriv->auth_algorithm == 2) { /* 802.1X */
+	if (psecuritypriv->auth_algorithm == _AUTH_8021x_) {
 		psetkeyparm->algorithm =
 			 (u8)psecuritypriv->XGrpPrivacy;
 	} else { /* WEP */
diff --git a/drivers/staging/rtl8712/rtl871x_security.h b/drivers/staging/rtl8712/rtl871x_security.h
index 5727a84838d3..34e5aecf92ae 100644
--- a/drivers/staging/rtl8712/rtl871x_security.h
+++ b/drivers/staging/rtl8712/rtl871x_security.h
@@ -24,6 +24,11 @@
 #define _AES_		0x4
 #define _WEP104_	0x5
 
+#define _AUTH_OPEN_SYSTEM_	0x0
+#define _AUTH_SHARED_SYSTEM_	0x1
+#define _AUTH_8021x_		0x2
+#define _AUTH_AUTHSWITCH_	0x3
+
 #define _WPA_IE_ID_	0xdd
 #define _WPA2_IE_ID_	0x30
 
-- 
2.34.1



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 0/3] staging: rtl8712: Tidy-up *Algrthm variables
  2024-10-12 16:17 [PATCH 0/3] staging: rtl8712: Tidy-up *Algrthm variables Dominik Karol Piątkowski
                   ` (2 preceding siblings ...)
  2024-10-12 16:17 ` [PATCH 3/3] staging: rtl8712: Introduce auth_algorithm macros Dominik Karol Piątkowski
@ 2024-10-13  9:09 ` Philipp Hortmann
  3 siblings, 0 replies; 5+ messages in thread
From: Philipp Hortmann @ 2024-10-13  9:09 UTC (permalink / raw)
  To: Dominik Karol Piątkowski, florian.c.schilhabel, gregkh,
	ayushtiw0110, dan.carpenter
  Cc: linux-staging, linux-kernel

On 12.10.24 18:17, Dominik Karol Piątkowski wrote:
> This series renames *Algrthm variables in order to avoid using camel case.
> 
> While at it, introduce auth_algorithm macros to increase readability by
> replacing hardcoded numbers in assignments and comparisons.
> 
> Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@protonmail.com>
> 
> Dominik Karol Piątkowski (3):
>    staging: rtl8712: Rename AuthAlgrthm variable
>    staging: rtl8712: Rename PrivacyAlgrthm variable
>    staging: rtl8712: Introduce auth_algorithm macros
> 
>   drivers/staging/rtl8712/mlme_linux.c          |  7 ++-
>   drivers/staging/rtl8712/rtl871x_cmd.c         |  6 +-
>   drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 61 ++++++++++---------
>   drivers/staging/rtl8712/rtl871x_ioctl_set.c   |  9 +--
>   drivers/staging/rtl8712/rtl871x_mlme.c        | 23 +++----
>   drivers/staging/rtl8712/rtl871x_recv.c        |  2 +-
>   drivers/staging/rtl8712/rtl871x_security.h    | 13 ++--
>   7 files changed, 65 insertions(+), 56 deletions(-)
> 

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> AW-NU120

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-10-13  9:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-12 16:17 [PATCH 0/3] staging: rtl8712: Tidy-up *Algrthm variables Dominik Karol Piątkowski
2024-10-12 16:17 ` [PATCH 1/3] staging: rtl8712: Rename AuthAlgrthm variable Dominik Karol Piątkowski
2024-10-12 16:17 ` [PATCH 2/3] staging: rtl8712: Rename PrivacyAlgrthm variable Dominik Karol Piątkowski
2024-10-12 16:17 ` [PATCH 3/3] staging: rtl8712: Introduce auth_algorithm macros Dominik Karol Piątkowski
2024-10-13  9:09 ` [PATCH 0/3] staging: rtl8712: Tidy-up *Algrthm variables Philipp Hortmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®