* [PATCH 1/3] Staging: rtl8192e: Rename variable pNetwork
2024-08-30 2:05 [PATCH 0/3] Staging: rtl8192e: Yet another variable rename and cleanup series Tree Davies
@ 2024-08-30 2:05 ` Tree Davies
2024-08-30 19:11 ` Philipp Hortmann
2024-08-30 2:05 ` [PATCH 2/3] Staging: rtl8192e: Rename variable bHwError Tree Davies
2024-08-30 2:05 ` [PATCH 3/3] Staging: rtl8192e: Add spaces around operators Tree Davies
2 siblings, 1 reply; 8+ messages in thread
From: Tree Davies @ 2024-08-30 2:05 UTC (permalink / raw)
To: gregkh, philipp.g.hortmann, anjan
Cc: linux-staging, linux-kernel, Tree Davies
Rename variable pNetwork to network
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <tdavies@darkphysics.net>
---
drivers/staging/rtl8192e/rtl819x_HTProc.c | 34 +++++++++++------------
drivers/staging/rtl8192e/rtllib.h | 4 +--
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index dfdb7a7dc14f..188e1fd9554d 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -559,7 +559,7 @@ void ht_initialize_bss_desc(struct bss_ht *bss_ht)
}
void ht_reset_self_and_save_peer_setting(struct rtllib_device *ieee,
- struct rtllib_network *pNetwork)
+ struct rtllib_network *network)
{
struct rt_hi_throughput *ht_info = ieee->ht_info;
u8 bIOTAction = 0;
@@ -567,32 +567,32 @@ void ht_reset_self_and_save_peer_setting(struct rtllib_device *ieee,
/* unmark enable_ht flag here is the same reason why unmarked in
* function rtllib_softmac_new_net. WB 2008.09.10
*/
- if (pNetwork->bssht.bd_support_ht) {
+ if (network->bssht.bd_support_ht) {
ht_info->current_ht_support = true;
- ht_info->peer_ht_spec_ver = pNetwork->bssht.bd_ht_spec_ver;
+ ht_info->peer_ht_spec_ver = network->bssht.bd_ht_spec_ver;
- if (pNetwork->bssht.bd_ht_cap_len > 0 &&
- pNetwork->bssht.bd_ht_cap_len <= sizeof(ht_info->peer_ht_cap_buf))
+ if (network->bssht.bd_ht_cap_len > 0 &&
+ network->bssht.bd_ht_cap_len <= sizeof(ht_info->peer_ht_cap_buf))
memcpy(ht_info->peer_ht_cap_buf,
- pNetwork->bssht.bd_ht_cap_buf,
- pNetwork->bssht.bd_ht_cap_len);
+ network->bssht.bd_ht_cap_buf,
+ network->bssht.bd_ht_cap_len);
- if (pNetwork->bssht.bd_ht_info_len > 0 &&
- pNetwork->bssht.bd_ht_info_len <=
+ if (network->bssht.bd_ht_info_len > 0 &&
+ network->bssht.bd_ht_info_len <=
sizeof(ht_info->peer_ht_info_buf))
memcpy(ht_info->peer_ht_info_buf,
- pNetwork->bssht.bd_ht_info_buf,
- pNetwork->bssht.bd_ht_info_len);
+ network->bssht.bd_ht_info_buf,
+ network->bssht.bd_ht_info_len);
ht_info->current_rt2rt_aggregation =
- pNetwork->bssht.bd_rt2rt_aggregation;
+ network->bssht.bd_rt2rt_aggregation;
ht_info->current_rt2rt_long_slot_time =
- pNetwork->bssht.bd_rt2rt_long_slot_time;
+ network->bssht.bd_rt2rt_long_slot_time;
ht_iot_peer_determine(ieee);
ht_info->iot_action = 0;
- bIOTAction = ht_iot_act_is_mgnt_use_cck_6m(ieee, pNetwork);
+ bIOTAction = ht_iot_act_is_mgnt_use_cck_6m(ieee, network);
if (bIOTAction)
ht_info->iot_action |= HT_IOT_ACT_MGNT_USE_CCK_6M;
bIOTAction = ht_iot_act_is_ccd_fsync(ieee);
@@ -609,14 +609,14 @@ void ht_reset_self_and_save_peer_setting(struct rtllib_device *ieee,
}
void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
- struct rtllib_network *pNetwork)
+ struct rtllib_network *network)
{
struct rt_hi_throughput *ht_info = ieee->ht_info;
struct ht_info_ele *pPeerHTInfo =
- (struct ht_info_ele *)pNetwork->bssht.bd_ht_info_buf;
+ (struct ht_info_ele *)network->bssht.bd_ht_info_buf;
if (ht_info->current_ht_support) {
- if (pNetwork->bssht.bd_ht_info_len != 0)
+ if (network->bssht.bd_ht_info_len != 0)
ht_info->current_op_mode = pPeerHTInfo->opt_mode;
}
}
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 7a1a68317a49..82fef04e5784 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1733,9 +1733,9 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee);
void ht_initialize_ht_info(struct rtllib_device *ieee);
void ht_initialize_bss_desc(struct bss_ht *bss_ht);
void ht_reset_self_and_save_peer_setting(struct rtllib_device *ieee,
- struct rtllib_network *pNetwork);
+ struct rtllib_network *network);
void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
- struct rtllib_network *pNetwork);
+ struct rtllib_network *network);
u8 ht_get_highest_mcs_rate(struct rtllib_device *ieee, u8 *pMCSRateSet,
u8 *pMCSFilter);
extern u8 MCS_FILTER_ALL[];
--
2.30.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] Staging: rtl8192e: Rename variable pNetwork
2024-08-30 2:05 ` [PATCH 1/3] Staging: rtl8192e: Rename variable pNetwork Tree Davies
@ 2024-08-30 19:11 ` Philipp Hortmann
0 siblings, 0 replies; 8+ messages in thread
From: Philipp Hortmann @ 2024-08-30 19:11 UTC (permalink / raw)
To: Tree Davies, gregkh, anjan; +Cc: linux-staging, linux-kernel
On 8/30/24 04:05, Tree Davies wrote:
> Rename variable pNetwork to network
> to fix checkpatch warning Avoid CamelCase.
>
> Signed-off-by: Tree Davies <tdavies@darkphysics.net>
> ---
> drivers/staging/rtl8192e/rtl819x_HTProc.c | 34 +++++++++++------------
> drivers/staging/rtl8192e/rtllib.h | 4 +--
> 2 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
> index dfdb7a7dc14f..188e1fd9554d 100644
> --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
> +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
> @@ -559,7 +559,7 @@ void ht_initialize_bss_desc(struct bss_ht *bss_ht)
> }
>
> void ht_reset_self_and_save_peer_setting(struct rtllib_device *ieee,
> - struct rtllib_network *pNetwork)
> + struct rtllib_network *network)
> {
> struct rt_hi_throughput *ht_info = ieee->ht_info;
> u8 bIOTAction = 0;
> @@ -567,32 +567,32 @@ void ht_reset_self_and_save_peer_setting(struct rtllib_device *ieee,
> /* unmark enable_ht flag here is the same reason why unmarked in
> * function rtllib_softmac_new_net. WB 2008.09.10
> */
> - if (pNetwork->bssht.bd_support_ht) {
> + if (network->bssht.bd_support_ht) {
> ht_info->current_ht_support = true;
> - ht_info->peer_ht_spec_ver = pNetwork->bssht.bd_ht_spec_ver;
> + ht_info->peer_ht_spec_ver = network->bssht.bd_ht_spec_ver;
>
> - if (pNetwork->bssht.bd_ht_cap_len > 0 &&
> - pNetwork->bssht.bd_ht_cap_len <= sizeof(ht_info->peer_ht_cap_buf))
> + if (network->bssht.bd_ht_cap_len > 0 &&
> + network->bssht.bd_ht_cap_len <= sizeof(ht_info->peer_ht_cap_buf))
> memcpy(ht_info->peer_ht_cap_buf,
> - pNetwork->bssht.bd_ht_cap_buf,
> - pNetwork->bssht.bd_ht_cap_len);
> + network->bssht.bd_ht_cap_buf,
> + network->bssht.bd_ht_cap_len);
>
> - if (pNetwork->bssht.bd_ht_info_len > 0 &&
> - pNetwork->bssht.bd_ht_info_len <=
> + if (network->bssht.bd_ht_info_len > 0 &&
> + network->bssht.bd_ht_info_len <=
> sizeof(ht_info->peer_ht_info_buf))
> memcpy(ht_info->peer_ht_info_buf,
> - pNetwork->bssht.bd_ht_info_buf,
> - pNetwork->bssht.bd_ht_info_len);
> + network->bssht.bd_ht_info_buf,
> + network->bssht.bd_ht_info_len);
>
> ht_info->current_rt2rt_aggregation =
> - pNetwork->bssht.bd_rt2rt_aggregation;
> + network->bssht.bd_rt2rt_aggregation;
> ht_info->current_rt2rt_long_slot_time =
> - pNetwork->bssht.bd_rt2rt_long_slot_time;
> + network->bssht.bd_rt2rt_long_slot_time;
>
> ht_iot_peer_determine(ieee);
>
> ht_info->iot_action = 0;
> - bIOTAction = ht_iot_act_is_mgnt_use_cck_6m(ieee, pNetwork);
> + bIOTAction = ht_iot_act_is_mgnt_use_cck_6m(ieee, network);
> if (bIOTAction)
> ht_info->iot_action |= HT_IOT_ACT_MGNT_USE_CCK_6M;
> bIOTAction = ht_iot_act_is_ccd_fsync(ieee);
> @@ -609,14 +609,14 @@ void ht_reset_self_and_save_peer_setting(struct rtllib_device *ieee,
> }
>
> void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
> - struct rtllib_network *pNetwork)
> + struct rtllib_network *network)
> {
> struct rt_hi_throughput *ht_info = ieee->ht_info;
> struct ht_info_ele *pPeerHTInfo =
> - (struct ht_info_ele *)pNetwork->bssht.bd_ht_info_buf;
> + (struct ht_info_ele *)network->bssht.bd_ht_info_buf;
>
> if (ht_info->current_ht_support) {
> - if (pNetwork->bssht.bd_ht_info_len != 0)
> + if (network->bssht.bd_ht_info_len != 0)
> ht_info->current_op_mode = pPeerHTInfo->opt_mode;
> }
> }
> diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
> index 7a1a68317a49..82fef04e5784 100644
> --- a/drivers/staging/rtl8192e/rtllib.h
> +++ b/drivers/staging/rtl8192e/rtllib.h
> @@ -1733,9 +1733,9 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee);
> void ht_initialize_ht_info(struct rtllib_device *ieee);
> void ht_initialize_bss_desc(struct bss_ht *bss_ht);
> void ht_reset_self_and_save_peer_setting(struct rtllib_device *ieee,
> - struct rtllib_network *pNetwork);
> + struct rtllib_network *network);
> void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
> - struct rtllib_network *pNetwork);
> + struct rtllib_network *network);
> u8 ht_get_highest_mcs_rate(struct rtllib_device *ieee, u8 *pMCSRateSet,
> u8 *pMCSFilter);
> extern u8 MCS_FILTER_ALL[];
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] Staging: rtl8192e: Rename variable bHwError
2024-08-30 2:05 [PATCH 0/3] Staging: rtl8192e: Yet another variable rename and cleanup series Tree Davies
2024-08-30 2:05 ` [PATCH 1/3] Staging: rtl8192e: Rename variable pNetwork Tree Davies
@ 2024-08-30 2:05 ` Tree Davies
2024-08-30 19:11 ` Philipp Hortmann
2024-08-30 2:05 ` [PATCH 3/3] Staging: rtl8192e: Add spaces around operators Tree Davies
2 siblings, 1 reply; 8+ messages in thread
From: Tree Davies @ 2024-08-30 2:05 UTC (permalink / raw)
To: gregkh, philipp.g.hortmann, anjan
Cc: linux-staging, linux-kernel, Tree Davies
Rename variable bHwError to hw_error
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <tdavies@darkphysics.net>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 ++++----
drivers/staging/rtl8192e/rtllib.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 519cad9e1106..15fda2d87da9 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -1506,7 +1506,7 @@ static void _rtl92e_translate_rx_signal_stats(struct net_device *dev,
(fc & IEEE80211_FCTL_TODS) ? hdr->addr1 :
(fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 :
hdr->addr3) &&
- (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV));
+ (!pstats->hw_error) && (!pstats->bCRC) && (!pstats->bICV));
bpacket_toself = bpacket_match_bssid && /* check this */
ether_addr_equal(praddr, priv->rtllib->dev->dev_addr);
if (ieee80211_is_beacon(hdr->frame_control))
@@ -1630,13 +1630,13 @@ bool rtl92e_get_rx_stats(struct net_device *dev, struct rtllib_rx_stats *stats,
stats->bICV = pdesc->ICV;
stats->bCRC = pdesc->CRC32;
- stats->bHwError = pdesc->CRC32 | pdesc->ICV;
+ stats->hw_error = pdesc->CRC32 | pdesc->ICV;
stats->Length = pdesc->Length;
if (stats->Length < 24)
- stats->bHwError |= 1;
+ stats->hw_error |= 1;
- if (stats->bHwError)
+ if (stats->hw_error)
return false;
stats->RxDrvInfoSize = pdesc->RxDrvInfoSize;
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 82fef04e5784..76f53b797644 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -467,7 +467,7 @@ struct rtllib_rx_stats {
u8 SignalQuality;
s32 RecvSignalPower;
u8 SignalStrength;
- u16 bHwError:1;
+ u16 hw_error:1;
u16 bCRC:1;
u16 bICV:1;
u16 decrypted:1;
--
2.30.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/3] Staging: rtl8192e: Rename variable bHwError
2024-08-30 2:05 ` [PATCH 2/3] Staging: rtl8192e: Rename variable bHwError Tree Davies
@ 2024-08-30 19:11 ` Philipp Hortmann
0 siblings, 0 replies; 8+ messages in thread
From: Philipp Hortmann @ 2024-08-30 19:11 UTC (permalink / raw)
To: Tree Davies, gregkh, anjan; +Cc: linux-staging, linux-kernel
On 8/30/24 04:05, Tree Davies wrote:
> Rename variable bHwError to hw_error
> to fix checkpatch warning Avoid CamelCase.
>
> Signed-off-by: Tree Davies <tdavies@darkphysics.net>
> ---
> drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 ++++----
> drivers/staging/rtl8192e/rtllib.h | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
> index 519cad9e1106..15fda2d87da9 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
> @@ -1506,7 +1506,7 @@ static void _rtl92e_translate_rx_signal_stats(struct net_device *dev,
> (fc & IEEE80211_FCTL_TODS) ? hdr->addr1 :
> (fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 :
> hdr->addr3) &&
> - (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV));
> + (!pstats->hw_error) && (!pstats->bCRC) && (!pstats->bICV));
> bpacket_toself = bpacket_match_bssid && /* check this */
> ether_addr_equal(praddr, priv->rtllib->dev->dev_addr);
> if (ieee80211_is_beacon(hdr->frame_control))
> @@ -1630,13 +1630,13 @@ bool rtl92e_get_rx_stats(struct net_device *dev, struct rtllib_rx_stats *stats,
>
> stats->bICV = pdesc->ICV;
> stats->bCRC = pdesc->CRC32;
> - stats->bHwError = pdesc->CRC32 | pdesc->ICV;
> + stats->hw_error = pdesc->CRC32 | pdesc->ICV;
>
> stats->Length = pdesc->Length;
> if (stats->Length < 24)
> - stats->bHwError |= 1;
> + stats->hw_error |= 1;
>
> - if (stats->bHwError)
> + if (stats->hw_error)
> return false;
>
> stats->RxDrvInfoSize = pdesc->RxDrvInfoSize;
> diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
> index 82fef04e5784..76f53b797644 100644
> --- a/drivers/staging/rtl8192e/rtllib.h
> +++ b/drivers/staging/rtl8192e/rtllib.h
> @@ -467,7 +467,7 @@ struct rtllib_rx_stats {
> u8 SignalQuality;
> s32 RecvSignalPower;
> u8 SignalStrength;
> - u16 bHwError:1;
> + u16 hw_error:1;
> u16 bCRC:1;
> u16 bICV:1;
> u16 decrypted:1;
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] Staging: rtl8192e: Add spaces around operators.
2024-08-30 2:05 [PATCH 0/3] Staging: rtl8192e: Yet another variable rename and cleanup series Tree Davies
2024-08-30 2:05 ` [PATCH 1/3] Staging: rtl8192e: Rename variable pNetwork Tree Davies
2024-08-30 2:05 ` [PATCH 2/3] Staging: rtl8192e: Rename variable bHwError Tree Davies
@ 2024-08-30 2:05 ` Tree Davies
2024-08-30 19:26 ` Philipp Hortmann
2 siblings, 1 reply; 8+ messages in thread
From: Tree Davies @ 2024-08-30 2:05 UTC (permalink / raw)
To: gregkh, philipp.g.hortmann, anjan
Cc: linux-staging, linux-kernel, Tree Davies
Add spaces around arithmetic and bitwise operators to improve
readability of the code.
Signed-off-by: Tree Davies <tdavies@darkphysics.net>
---
drivers/staging/rtl8192e/rtllib.h | 62 +++++++++++++++----------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 76f53b797644..17a6fb565c9d 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -339,12 +339,12 @@ enum rt_op_mode {
#define FC_QOS_BIT BIT(7)
#define is_data_frame(pdu) (((pdu[0] & 0x0C) == 0x08) ? true : false)
-#define is_legacy_data_frame(pdu) (is_data_frame(pdu) && (!(pdu[0]&FC_QOS_BIT)))
+#define is_legacy_data_frame(pdu) (is_data_frame(pdu) && (!(pdu[0] & FC_QOS_BIT)))
#define is_qos_data_frame(pframe) \
- ((*(u16 *)pframe&(IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) == \
- (IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA))
-#define frame_order(pframe) (*(u16 *)pframe&IEEE80211_FCTL_ORDER)
-#define SN_LESS(a, b) (((a-b)&0x800) != 0)
+ ((*(u16 *)pframe & (IEEE80211_STYPE_QOS_DATA | RTLLIB_FTYPE_DATA)) == \
+ (IEEE80211_STYPE_QOS_DATA | RTLLIB_FTYPE_DATA))
+#define frame_order(pframe) (*(u16 *)pframe & IEEE80211_FCTL_ORDER)
+#define SN_LESS(a, b) (((a - b) & 0x800) != 0)
#define SN_EQUAL(a, b) (a == b)
#define MAX_DEV_ADDR_SIZE 8
@@ -414,13 +414,13 @@ enum _REG_PREAMBLE_MODE {
#define WLAN_GET_SEQ_FRAG(seq) ((seq) & RTLLIB_SCTL_FRAG)
#define WLAN_GET_SEQ_SEQ(seq) (((seq) & RTLLIB_SCTL_SEQ) >> 4)
-#define RTLLIB_STATMASK_SIGNAL (1<<0)
-#define RTLLIB_STATMASK_RSSI (1<<1)
-#define RTLLIB_STATMASK_NOISE (1<<2)
+#define RTLLIB_STATMASK_SIGNAL (1 << 0)
+#define RTLLIB_STATMASK_RSSI (1 << 1)
+#define RTLLIB_STATMASK_NOISE (1 << 2)
#define RTLLIB_STATMASK_WEMASK 0x7
-#define RTLLIB_CCK_MODULATION (1<<0)
-#define RTLLIB_OFDM_MODULATION (1<<1)
+#define RTLLIB_CCK_MODULATION (1 << 0)
+#define RTLLIB_OFDM_MODULATION (1 << 1)
#define RTLLIB_CCK_RATE_LEN 4
#define RTLLIB_CCK_RATE_1MB 0x02
@@ -507,11 +507,11 @@ struct rtllib_frag_entry {
struct rtllib_device;
-#define SEC_ACTIVE_KEY (1<<4)
-#define SEC_AUTH_MODE (1<<5)
-#define SEC_UNICAST_GROUP (1<<6)
-#define SEC_LEVEL (1<<7)
-#define SEC_ENABLED (1<<8)
+#define SEC_ACTIVE_KEY (1 << 4)
+#define SEC_AUTH_MODE (1 << 5)
+#define SEC_UNICAST_GROUP (1 << 6)
+#define SEC_LEVEL (1 << 7)
+#define SEC_ENABLED (1 << 8)
#define SEC_LEVEL_0 0 /* None */
#define SEC_LEVEL_1 1 /* WEP 40 and 104 bit */
@@ -696,17 +696,17 @@ union frameqos {
#define MAX_WPA_IE_LEN 64
#define MAX_WZC_IE_LEN 256
-#define NETWORK_EMPTY_ESSID (1<<0)
-#define NETWORK_HAS_OFDM (1<<1)
-#define NETWORK_HAS_CCK (1<<2)
+#define NETWORK_EMPTY_ESSID (1 << 0)
+#define NETWORK_HAS_OFDM (1 << 1)
+#define NETWORK_HAS_CCK (1 << 2)
/* QoS structure */
-#define NETWORK_HAS_QOS_PARAMETERS (1<<3)
-#define NETWORK_HAS_QOS_INFORMATION (1<<4)
+#define NETWORK_HAS_QOS_PARAMETERS (1 << 3)
+#define NETWORK_HAS_QOS_INFORMATION (1 << 4)
#define NETWORK_HAS_QOS_MASK (NETWORK_HAS_QOS_PARAMETERS | \
NETWORK_HAS_QOS_INFORMATION)
/* 802.11h */
-#define NETWORK_HAS_ERP_VALUE (1<<10)
+#define NETWORK_HAS_ERP_VALUE (1 << 10)
#define QOS_QUEUE_NUM 4
#define QOS_OUI_LEN 3
@@ -996,8 +996,8 @@ enum rtl_link_state {
#define DEFAULT_MAX_SCAN_AGE (15 * HZ)
#define DEFAULT_FTS 2346
-#define CFG_RTLLIB_RESERVE_FCS (1<<0)
-#define CFG_RTLLIB_COMPUTE_FCS (1<<1)
+#define CFG_RTLLIB_RESERVE_FCS (1 << 0)
+#define CFG_RTLLIB_COMPUTE_FCS (1 << 1)
struct tx_pending {
int frag;
@@ -1288,7 +1288,7 @@ struct rtllib_device {
u16 scan_watch_dog;
/* map of allowed channels. 0 is dummy */
- u8 active_channel_map[MAX_CHANNEL_NUMBER+1];
+ u8 active_channel_map[MAX_CHANNEL_NUMBER + 1];
int rate; /* current rate */
int basic_rate;
@@ -1486,32 +1486,32 @@ struct rtllib_device {
/* Uses the channel change callback directly
* instead of [start/stop] scan callbacks
*/
-#define IEEE_SOFTMAC_SCAN (1<<2)
+#define IEEE_SOFTMAC_SCAN (1 << 2)
/* Perform authentication and association handshake */
-#define IEEE_SOFTMAC_ASSOCIATE (1<<3)
+#define IEEE_SOFTMAC_ASSOCIATE (1 << 3)
/* Generate probe requests */
-#define IEEE_SOFTMAC_PROBERQ (1<<4)
+#define IEEE_SOFTMAC_PROBERQ (1 << 4)
/* Generate response to probe requests */
-#define IEEE_SOFTMAC_PROBERS (1<<5)
+#define IEEE_SOFTMAC_PROBERS (1 << 5)
/* The ieee802.11 stack will manage the netif queue
* wake/stop for the driver, taking care of 802.11
* fragmentation. See softmac.c for details.
*/
-#define IEEE_SOFTMAC_TX_QUEUE (1<<7)
+#define IEEE_SOFTMAC_TX_QUEUE (1 << 7)
/* Uses only the softmac_data_hard_start_xmit
* even for TX management frames.
*/
-#define IEEE_SOFTMAC_SINGLE_QUEUE (1<<8)
+#define IEEE_SOFTMAC_SINGLE_QUEUE (1 << 8)
/* Generate beacons. The stack will enqueue beacons
* to the card
*/
-#define IEEE_SOFTMAC_BEACONS (1<<6)
+#define IEEE_SOFTMAC_BEACONS (1 << 6)
static inline void *rtllib_priv(struct net_device *dev)
{
--
2.30.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] Staging: rtl8192e: Add spaces around operators.
2024-08-30 2:05 ` [PATCH 3/3] Staging: rtl8192e: Add spaces around operators Tree Davies
@ 2024-08-30 19:26 ` Philipp Hortmann
2024-09-03 8:34 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Philipp Hortmann @ 2024-08-30 19:26 UTC (permalink / raw)
To: Tree Davies, gregkh, anjan; +Cc: linux-staging, linux-kernel
On 8/30/24 04:05, Tree Davies wrote:
> Add spaces around arithmetic and bitwise operators to improve
> readability of the code.
>
> Signed-off-by: Tree Davies <tdavies@darkphysics.net>
> ---
> drivers/staging/rtl8192e/rtllib.h | 62 +++++++++++++++----------------
> 1 file changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
> index 76f53b797644..17a6fb565c9d 100644
> --- a/drivers/staging/rtl8192e/rtllib.h
> +++ b/drivers/staging/rtl8192e/rtllib.h
> @@ -339,12 +339,12 @@ enum rt_op_mode {
>
> #define FC_QOS_BIT BIT(7)
> #define is_data_frame(pdu) (((pdu[0] & 0x0C) == 0x08) ? true : false)
> -#define is_legacy_data_frame(pdu) (is_data_frame(pdu) && (!(pdu[0]&FC_QOS_BIT)))
> +#define is_legacy_data_frame(pdu) (is_data_frame(pdu) && (!(pdu[0] & FC_QOS_BIT)))
> #define is_qos_data_frame(pframe) \
> - ((*(u16 *)pframe&(IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) == \
> - (IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA))
> -#define frame_order(pframe) (*(u16 *)pframe&IEEE80211_FCTL_ORDER)
> -#define SN_LESS(a, b) (((a-b)&0x800) != 0)
> + ((*(u16 *)pframe & (IEEE80211_STYPE_QOS_DATA | RTLLIB_FTYPE_DATA)) == \
> + (IEEE80211_STYPE_QOS_DATA | RTLLIB_FTYPE_DATA))
> +#define frame_order(pframe) (*(u16 *)pframe & IEEE80211_FCTL_ORDER)
> +#define SN_LESS(a, b) (((a - b) & 0x800) != 0)
> #define SN_EQUAL(a, b) (a == b)
> #define MAX_DEV_ADDR_SIZE 8
>
> @@ -414,13 +414,13 @@ enum _REG_PREAMBLE_MODE {
> #define WLAN_GET_SEQ_FRAG(seq) ((seq) & RTLLIB_SCTL_FRAG)
> #define WLAN_GET_SEQ_SEQ(seq) (((seq) & RTLLIB_SCTL_SEQ) >> 4)
>
> -#define RTLLIB_STATMASK_SIGNAL (1<<0)
> -#define RTLLIB_STATMASK_RSSI (1<<1)
> -#define RTLLIB_STATMASK_NOISE (1<<2)
> +#define RTLLIB_STATMASK_SIGNAL (1 << 0)
> +#define RTLLIB_STATMASK_RSSI (1 << 1)
> +#define RTLLIB_STATMASK_NOISE (1 << 2)
> #define RTLLIB_STATMASK_WEMASK 0x7
>
> -#define RTLLIB_CCK_MODULATION (1<<0)
> -#define RTLLIB_OFDM_MODULATION (1<<1)
> +#define RTLLIB_CCK_MODULATION (1 << 0)
> +#define RTLLIB_OFDM_MODULATION (1 << 1)
>
> #define RTLLIB_CCK_RATE_LEN 4
> #define RTLLIB_CCK_RATE_1MB 0x02
> @@ -507,11 +507,11 @@ struct rtllib_frag_entry {
>
> struct rtllib_device;
>
> -#define SEC_ACTIVE_KEY (1<<4)
> -#define SEC_AUTH_MODE (1<<5)
> -#define SEC_UNICAST_GROUP (1<<6)
> -#define SEC_LEVEL (1<<7)
> -#define SEC_ENABLED (1<<8)
> +#define SEC_ACTIVE_KEY (1 << 4)
> +#define SEC_AUTH_MODE (1 << 5)
> +#define SEC_UNICAST_GROUP (1 << 6)
> +#define SEC_LEVEL (1 << 7)
> +#define SEC_ENABLED (1 << 8)
>
> #define SEC_LEVEL_0 0 /* None */
> #define SEC_LEVEL_1 1 /* WEP 40 and 104 bit */
> @@ -696,17 +696,17 @@ union frameqos {
> #define MAX_WPA_IE_LEN 64
> #define MAX_WZC_IE_LEN 256
>
> -#define NETWORK_EMPTY_ESSID (1<<0)
> -#define NETWORK_HAS_OFDM (1<<1)
> -#define NETWORK_HAS_CCK (1<<2)
> +#define NETWORK_EMPTY_ESSID (1 << 0)
> +#define NETWORK_HAS_OFDM (1 << 1)
> +#define NETWORK_HAS_CCK (1 << 2)
>
> /* QoS structure */
> -#define NETWORK_HAS_QOS_PARAMETERS (1<<3)
> -#define NETWORK_HAS_QOS_INFORMATION (1<<4)
> +#define NETWORK_HAS_QOS_PARAMETERS (1 << 3)
> +#define NETWORK_HAS_QOS_INFORMATION (1 << 4)
> #define NETWORK_HAS_QOS_MASK (NETWORK_HAS_QOS_PARAMETERS | \
> NETWORK_HAS_QOS_INFORMATION)
> /* 802.11h */
> -#define NETWORK_HAS_ERP_VALUE (1<<10)
> +#define NETWORK_HAS_ERP_VALUE (1 << 10)
>
> #define QOS_QUEUE_NUM 4
> #define QOS_OUI_LEN 3
> @@ -996,8 +996,8 @@ enum rtl_link_state {
> #define DEFAULT_MAX_SCAN_AGE (15 * HZ)
> #define DEFAULT_FTS 2346
>
> -#define CFG_RTLLIB_RESERVE_FCS (1<<0)
> -#define CFG_RTLLIB_COMPUTE_FCS (1<<1)
> +#define CFG_RTLLIB_RESERVE_FCS (1 << 0)
> +#define CFG_RTLLIB_COMPUTE_FCS (1 << 1)
>
> struct tx_pending {
> int frag;
> @@ -1288,7 +1288,7 @@ struct rtllib_device {
> u16 scan_watch_dog;
>
> /* map of allowed channels. 0 is dummy */
> - u8 active_channel_map[MAX_CHANNEL_NUMBER+1];
> + u8 active_channel_map[MAX_CHANNEL_NUMBER + 1];
>
> int rate; /* current rate */
> int basic_rate;
> @@ -1486,32 +1486,32 @@ struct rtllib_device {
> /* Uses the channel change callback directly
> * instead of [start/stop] scan callbacks
> */
> -#define IEEE_SOFTMAC_SCAN (1<<2)
> +#define IEEE_SOFTMAC_SCAN (1 << 2)
>
> /* Perform authentication and association handshake */
> -#define IEEE_SOFTMAC_ASSOCIATE (1<<3)
> +#define IEEE_SOFTMAC_ASSOCIATE (1 << 3)
>
> /* Generate probe requests */
> -#define IEEE_SOFTMAC_PROBERQ (1<<4)
> +#define IEEE_SOFTMAC_PROBERQ (1 << 4)
>
> /* Generate response to probe requests */
> -#define IEEE_SOFTMAC_PROBERS (1<<5)
> +#define IEEE_SOFTMAC_PROBERS (1 << 5)
>
> /* The ieee802.11 stack will manage the netif queue
> * wake/stop for the driver, taking care of 802.11
> * fragmentation. See softmac.c for details.
> */
> -#define IEEE_SOFTMAC_TX_QUEUE (1<<7)
> +#define IEEE_SOFTMAC_TX_QUEUE (1 << 7)
>
> /* Uses only the softmac_data_hard_start_xmit
> * even for TX management frames.
> */
> -#define IEEE_SOFTMAC_SINGLE_QUEUE (1<<8)
> +#define IEEE_SOFTMAC_SINGLE_QUEUE (1 << 8)
>
> /* Generate beacons. The stack will enqueue beacons
> * to the card
> */
> -#define IEEE_SOFTMAC_BEACONS (1<<6)
> +#define IEEE_SOFTMAC_BEACONS (1 << 6)
>
> static inline void *rtllib_priv(struct net_device *dev)
> {
Hi Tree,
in many of the above cases checkpatch is asking for using the BIT macro.
So when you add the spaces to those lines the next change requested by
ckeckpatch is the BIT macro. I think we should switch only once.
Find examples below:
CHECK: Prefer using the BIT macro
#44: FILE: drivers/staging/rtl8192e/rtllib.h:417:
+#define RTLLIB_STATMASK_SIGNAL (1 << 0)
CHECK: Prefer using the BIT macro
#45: FILE: drivers/staging/rtl8192e/rtllib.h:418:
+#define RTLLIB_STATMASK_RSSI (1 << 1)
CHECK: Prefer using the BIT macro
#46: FILE: drivers/staging/rtl8192e/rtllib.h:419:
+#define RTLLIB_STATMASK_NOISE (1 << 2)
CHECK: Prefer using the BIT macro
#51: FILE: drivers/staging/rtl8192e/rtllib.h:422:
+#define RTLLIB_CCK_MODULATION (1 << 0)
CHECK: Prefer using the BIT macro
#52: FILE: drivers/staging/rtl8192e/rtllib.h:423:
+#define RTLLIB_OFDM_MODULATION (1 << 1)
Thanks for your support.
Bye Philipp
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] Staging: rtl8192e: Add spaces around operators.
2024-08-30 19:26 ` Philipp Hortmann
@ 2024-09-03 8:34 ` Greg KH
0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2024-09-03 8:34 UTC (permalink / raw)
To: Philipp Hortmann; +Cc: Tree Davies, anjan, linux-staging, linux-kernel
On Fri, Aug 30, 2024 at 09:26:42PM +0200, Philipp Hortmann wrote:
> On 8/30/24 04:05, Tree Davies wrote:
> > Add spaces around arithmetic and bitwise operators to improve
> > readability of the code.
> >
> > Signed-off-by: Tree Davies <tdavies@darkphysics.net>
> > ---
> > drivers/staging/rtl8192e/rtllib.h | 62 +++++++++++++++----------------
> > 1 file changed, 31 insertions(+), 31 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
> > index 76f53b797644..17a6fb565c9d 100644
> > --- a/drivers/staging/rtl8192e/rtllib.h
> > +++ b/drivers/staging/rtl8192e/rtllib.h
> > @@ -339,12 +339,12 @@ enum rt_op_mode {
> > #define FC_QOS_BIT BIT(7)
> > #define is_data_frame(pdu) (((pdu[0] & 0x0C) == 0x08) ? true : false)
> > -#define is_legacy_data_frame(pdu) (is_data_frame(pdu) && (!(pdu[0]&FC_QOS_BIT)))
> > +#define is_legacy_data_frame(pdu) (is_data_frame(pdu) && (!(pdu[0] & FC_QOS_BIT)))
> > #define is_qos_data_frame(pframe) \
> > - ((*(u16 *)pframe&(IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) == \
> > - (IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA))
> > -#define frame_order(pframe) (*(u16 *)pframe&IEEE80211_FCTL_ORDER)
> > -#define SN_LESS(a, b) (((a-b)&0x800) != 0)
> > + ((*(u16 *)pframe & (IEEE80211_STYPE_QOS_DATA | RTLLIB_FTYPE_DATA)) == \
> > + (IEEE80211_STYPE_QOS_DATA | RTLLIB_FTYPE_DATA))
> > +#define frame_order(pframe) (*(u16 *)pframe & IEEE80211_FCTL_ORDER)
> > +#define SN_LESS(a, b) (((a - b) & 0x800) != 0)
> > #define SN_EQUAL(a, b) (a == b)
> > #define MAX_DEV_ADDR_SIZE 8
> > @@ -414,13 +414,13 @@ enum _REG_PREAMBLE_MODE {
> > #define WLAN_GET_SEQ_FRAG(seq) ((seq) & RTLLIB_SCTL_FRAG)
> > #define WLAN_GET_SEQ_SEQ(seq) (((seq) & RTLLIB_SCTL_SEQ) >> 4)
> > -#define RTLLIB_STATMASK_SIGNAL (1<<0)
> > -#define RTLLIB_STATMASK_RSSI (1<<1)
> > -#define RTLLIB_STATMASK_NOISE (1<<2)
> > +#define RTLLIB_STATMASK_SIGNAL (1 << 0)
> > +#define RTLLIB_STATMASK_RSSI (1 << 1)
> > +#define RTLLIB_STATMASK_NOISE (1 << 2)
> > #define RTLLIB_STATMASK_WEMASK 0x7
> > -#define RTLLIB_CCK_MODULATION (1<<0)
> > -#define RTLLIB_OFDM_MODULATION (1<<1)
> > +#define RTLLIB_CCK_MODULATION (1 << 0)
> > +#define RTLLIB_OFDM_MODULATION (1 << 1)
> > #define RTLLIB_CCK_RATE_LEN 4
> > #define RTLLIB_CCK_RATE_1MB 0x02
> > @@ -507,11 +507,11 @@ struct rtllib_frag_entry {
> > struct rtllib_device;
> > -#define SEC_ACTIVE_KEY (1<<4)
> > -#define SEC_AUTH_MODE (1<<5)
> > -#define SEC_UNICAST_GROUP (1<<6)
> > -#define SEC_LEVEL (1<<7)
> > -#define SEC_ENABLED (1<<8)
> > +#define SEC_ACTIVE_KEY (1 << 4)
> > +#define SEC_AUTH_MODE (1 << 5)
> > +#define SEC_UNICAST_GROUP (1 << 6)
> > +#define SEC_LEVEL (1 << 7)
> > +#define SEC_ENABLED (1 << 8)
> > #define SEC_LEVEL_0 0 /* None */
> > #define SEC_LEVEL_1 1 /* WEP 40 and 104 bit */
> > @@ -696,17 +696,17 @@ union frameqos {
> > #define MAX_WPA_IE_LEN 64
> > #define MAX_WZC_IE_LEN 256
> > -#define NETWORK_EMPTY_ESSID (1<<0)
> > -#define NETWORK_HAS_OFDM (1<<1)
> > -#define NETWORK_HAS_CCK (1<<2)
> > +#define NETWORK_EMPTY_ESSID (1 << 0)
> > +#define NETWORK_HAS_OFDM (1 << 1)
> > +#define NETWORK_HAS_CCK (1 << 2)
> > /* QoS structure */
> > -#define NETWORK_HAS_QOS_PARAMETERS (1<<3)
> > -#define NETWORK_HAS_QOS_INFORMATION (1<<4)
> > +#define NETWORK_HAS_QOS_PARAMETERS (1 << 3)
> > +#define NETWORK_HAS_QOS_INFORMATION (1 << 4)
> > #define NETWORK_HAS_QOS_MASK (NETWORK_HAS_QOS_PARAMETERS | \
> > NETWORK_HAS_QOS_INFORMATION)
> > /* 802.11h */
> > -#define NETWORK_HAS_ERP_VALUE (1<<10)
> > +#define NETWORK_HAS_ERP_VALUE (1 << 10)
> > #define QOS_QUEUE_NUM 4
> > #define QOS_OUI_LEN 3
> > @@ -996,8 +996,8 @@ enum rtl_link_state {
> > #define DEFAULT_MAX_SCAN_AGE (15 * HZ)
> > #define DEFAULT_FTS 2346
> > -#define CFG_RTLLIB_RESERVE_FCS (1<<0)
> > -#define CFG_RTLLIB_COMPUTE_FCS (1<<1)
> > +#define CFG_RTLLIB_RESERVE_FCS (1 << 0)
> > +#define CFG_RTLLIB_COMPUTE_FCS (1 << 1)
> > struct tx_pending {
> > int frag;
> > @@ -1288,7 +1288,7 @@ struct rtllib_device {
> > u16 scan_watch_dog;
> > /* map of allowed channels. 0 is dummy */
> > - u8 active_channel_map[MAX_CHANNEL_NUMBER+1];
> > + u8 active_channel_map[MAX_CHANNEL_NUMBER + 1];
> > int rate; /* current rate */
> > int basic_rate;
> > @@ -1486,32 +1486,32 @@ struct rtllib_device {
> > /* Uses the channel change callback directly
> > * instead of [start/stop] scan callbacks
> > */
> > -#define IEEE_SOFTMAC_SCAN (1<<2)
> > +#define IEEE_SOFTMAC_SCAN (1 << 2)
> > /* Perform authentication and association handshake */
> > -#define IEEE_SOFTMAC_ASSOCIATE (1<<3)
> > +#define IEEE_SOFTMAC_ASSOCIATE (1 << 3)
> > /* Generate probe requests */
> > -#define IEEE_SOFTMAC_PROBERQ (1<<4)
> > +#define IEEE_SOFTMAC_PROBERQ (1 << 4)
> > /* Generate response to probe requests */
> > -#define IEEE_SOFTMAC_PROBERS (1<<5)
> > +#define IEEE_SOFTMAC_PROBERS (1 << 5)
> > /* The ieee802.11 stack will manage the netif queue
> > * wake/stop for the driver, taking care of 802.11
> > * fragmentation. See softmac.c for details.
> > */
> > -#define IEEE_SOFTMAC_TX_QUEUE (1<<7)
> > +#define IEEE_SOFTMAC_TX_QUEUE (1 << 7)
> > /* Uses only the softmac_data_hard_start_xmit
> > * even for TX management frames.
> > */
> > -#define IEEE_SOFTMAC_SINGLE_QUEUE (1<<8)
> > +#define IEEE_SOFTMAC_SINGLE_QUEUE (1 << 8)
> > /* Generate beacons. The stack will enqueue beacons
> > * to the card
> > */
> > -#define IEEE_SOFTMAC_BEACONS (1<<6)
> > +#define IEEE_SOFTMAC_BEACONS (1 << 6)
> > static inline void *rtllib_priv(struct net_device *dev)
> > {
>
> Hi Tree,
>
> in many of the above cases checkpatch is asking for using the BIT macro. So
> when you add the spaces to those lines the next change requested by
> ckeckpatch is the BIT macro. I think we should switch only once.
> Find examples below:
>
> CHECK: Prefer using the BIT macro
> #44: FILE: drivers/staging/rtl8192e/rtllib.h:417:
> +#define RTLLIB_STATMASK_SIGNAL (1 << 0)
>
> CHECK: Prefer using the BIT macro
> #45: FILE: drivers/staging/rtl8192e/rtllib.h:418:
> +#define RTLLIB_STATMASK_RSSI (1 << 1)
>
> CHECK: Prefer using the BIT macro
> #46: FILE: drivers/staging/rtl8192e/rtllib.h:419:
> +#define RTLLIB_STATMASK_NOISE (1 << 2)
>
> CHECK: Prefer using the BIT macro
> #51: FILE: drivers/staging/rtl8192e/rtllib.h:422:
> +#define RTLLIB_CCK_MODULATION (1 << 0)
>
> CHECK: Prefer using the BIT macro
> #52: FILE: drivers/staging/rtl8192e/rtllib.h:423:
> +#define RTLLIB_OFDM_MODULATION (1 << 1)
I'll take this now and then the BIT() conversion can happen later.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread