10/11 patches in this series rename variables to fix camelCase style
guide violations. The 11th patch implements the use of the BIT macro
instead of regular bit shift operations.
MOTE: Because patch #11 changes DEFINEs the compiler issues
redefinition warnings. I don't know how to address these as part
of this submission.
All changes Tested on Hardware
Thank you in advance to reviewers.
Tree
Tree Davies (11):
Staging: rtl8192e: Rename variable ReturnPoint
Staging: rtl8192e: Rename variable TimeStampLow
Staging: rtl8192e: Rename variable TimeStampHigh
Staging: rtl8192e: Rename variable Frame_Order
Staging: rtl8192e: Rename variable aSifsTime
Staging: rtl8192e: Rename variable posHTCap
Staging: rtl8192e: Rename variable bRTSUseShortPreamble
Staging: rtl8192e: Rename variable pBssHT
Staging: rtl8192e: Rename variable bAllowAllDA
Staging: rtl8192e: Rename variable WriteIntoReg
Staging: rtl8192e: Implement BIT macro for bit shift ops
.../staging/rtl8192e/rtl8192e/r8192E_dev.c | 16 ++--
.../staging/rtl8192e/rtl8192e/r8192E_dev.h | 4 +-
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 24 +++---
drivers/staging/rtl8192e/rtllib.h | 80 +++++++++----------
5 files changed, 63 insertions(+), 63 deletions(-)
--
2.30.2
Rename variable ReturnPoint to return_point to fix
checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 649b529657ba..08d057ab8f74 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -964,7 +964,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)
MAC80211_NOLINK) &&
(ieee->rf_power_state == rf_on) && !ieee->is_set_key &&
(!ieee->proto_stoppping) && !ieee->wx_set_enc) {
- if (ieee->pwr_save_ctrl.ReturnPoint == IPS_CALLBACK_NONE)
+ if (ieee->pwr_save_ctrl.return_point == IPS_CALLBACK_NONE)
rtl92e_ips_enter(dev);
}
}
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 6fbf11ac168f..b2b8947da89d 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1051,7 +1051,7 @@ enum rt_rf_power_state {
struct rt_pwr_save_ctrl {
bool bSwRfProcessing;
enum rt_rf_power_state eInactivePowerState;
- enum ips_callback_function ReturnPoint;
+ enum ips_callback_function return_point;
bool bLeisurePs;
u8 lps_idle_count;
--
2.30.2
Rename variable TimeStampLow to time_stamp_low to fix
checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index e3ed709a7674..480315404969 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -1659,7 +1659,7 @@ bool rtl92e_get_rx_stats(struct net_device *dev, struct rtllib_rx_stats *stats,
stats->bFirstMPDU = (pDrvInfo->PartAggr == 1) &&
(pDrvInfo->FirstAGGR == 1);
- stats->TimeStampLow = pDrvInfo->TSFL;
+ stats->time_stamp_low = pDrvInfo->TSFL;
stats->TimeStampHigh = rtl92e_readl(dev, TSFR + 4);
_rtl92e_translate_rx_signal_stats(dev, skb, stats, pdesc, pDrvInfo);
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index b2b8947da89d..72264e1ef877 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -482,7 +482,7 @@ struct rtllib_rx_stats {
u16 bCRC:1;
u16 bICV:1;
u16 Decrypted:1;
- u32 TimeStampLow;
+ u32 time_stamp_low;
u32 TimeStampHigh;
u8 RxDrvInfoSize;
--
2.30.2
Rename variable TimeStampHigh to time_stamp_high to fix
checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 480315404969..15b0ac6e6eef 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -1660,7 +1660,7 @@ bool rtl92e_get_rx_stats(struct net_device *dev, struct rtllib_rx_stats *stats,
(pDrvInfo->FirstAGGR == 1);
stats->time_stamp_low = pDrvInfo->TSFL;
- stats->TimeStampHigh = rtl92e_readl(dev, TSFR + 4);
+ stats->time_stamp_high = rtl92e_readl(dev, TSFR + 4);
_rtl92e_translate_rx_signal_stats(dev, skb, stats, pdesc, pDrvInfo);
skb_trim(skb, skb->len - S_CRC_LEN);
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 72264e1ef877..e165f1e32e7f 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -483,7 +483,7 @@ struct rtllib_rx_stats {
u16 bICV:1;
u16 Decrypted:1;
u32 time_stamp_low;
- u32 TimeStampHigh;
+ u32 time_stamp_high;
u8 RxDrvInfoSize;
u8 RxBufShift;
--
2.30.2
Rename variable Frame_Order frame_order to fix
checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index fa96a2c2c916..dd0e2931b9ca 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -625,7 +625,7 @@ EXPORT_SYMBOL(HT_update_self_and_peer_setting);
u8 ht_c_check(struct rtllib_device *ieee, u8 *pFrame)
{
if (ieee->ht_info->current_ht_support) {
- if ((IsQoSDataFrame(pFrame) && Frame_Order(pFrame)) == 1) {
+ if ((IsQoSDataFrame(pFrame) && frame_order(pFrame)) == 1) {
netdev_dbg(ieee->dev, "HT CONTROL FILED EXIST!!\n");
return true;
}
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index e165f1e32e7f..748bb25cbd23 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -343,7 +343,7 @@ enum rt_op_mode {
#define IsQoSDataFrame(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 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
--
2.30.2
Rename variable aSifsTime to asifs_time to fix
checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 15b0ac6e6eef..dcb78cd2e840 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -130,7 +130,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
&priv->rtllib->current_network.qos_data.parameters;
u1bAIFS = qop->aifs[pAcParam] *
- ((mode & (WIRELESS_MODE_G | WIRELESS_MODE_N_24G)) ? 9 : 20) + aSifsTime;
+ ((mode & (WIRELESS_MODE_G | WIRELESS_MODE_N_24G)) ? 9 : 20) + asifs_time;
rtl92e_dm_init_edca_turbo(dev);
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 748bb25cbd23..640fb8abcfa3 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -299,7 +299,7 @@ enum rt_op_mode {
RT_OP_MODE_NO_LINK,
};
-#define aSifsTime \
+#define asifs_time \
((priv->rtllib->current_network.mode == WIRELESS_MODE_N_24G) ? 16 : 10)
#define MGMT_QUEUE_NUM 5
--
2.30.2
Rename variable posHTCap to pos_ht_cap to fix
checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index dd0e2931b9ca..1c3ef1b7ebd8 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -235,7 +235,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
if (!pos_ht_cap || !ht) {
netdev_warn(ieee->dev,
- "%s(): posHTCap and ht_info are null\n", __func__);
+ "%s(): pos_ht_cap and ht_info are null\n", __func__);
return;
}
memset(pos_ht_cap, 0, *len);
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 640fb8abcfa3..525242b0313f 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1736,7 +1736,7 @@ void ht_set_connect_bw_mode(struct rtllib_device *ieee,
enum ht_extchnl_offset Offset);
void ht_update_default_setting(struct rtllib_device *ieee);
void ht_construct_capability_element(struct rtllib_device *ieee,
- u8 *posHTCap, u8 *len,
+ u8 *pos_ht_cap, u8 *len,
u8 isEncrypt, bool bAssoc);
void ht_construct_rt2rt_agg_element(struct rtllib_device *ieee,
u8 *posRT2RTAgg, u8 *len);
--
2.30.2
Rename variable pBssHT to bss_ht
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl819x_HTProc.c | 20 ++++++++++----------
drivers/staging/rtl8192e/rtllib.h | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 1c3ef1b7ebd8..618523bacc8e 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -543,19 +543,19 @@ void ht_initialize_ht_info(struct rtllib_device *ieee)
}
}
-void ht_initialize_bss_desc(struct bss_ht *pBssHT)
+void ht_initialize_bss_desc(struct bss_ht *bss_ht)
{
- pBssHT->bd_support_ht = false;
- memset(pBssHT->bd_ht_cap_buf, 0, sizeof(pBssHT->bd_ht_cap_buf));
- pBssHT->bd_ht_cap_len = 0;
- memset(pBssHT->bd_ht_info_buf, 0, sizeof(pBssHT->bd_ht_info_buf));
- pBssHT->bd_ht_info_len = 0;
+ bss_ht->bd_support_ht = false;
+ memset(bss_ht->bd_ht_cap_buf, 0, sizeof(bss_ht->bd_ht_cap_buf));
+ bss_ht->bd_ht_cap_len = 0;
+ memset(bss_ht->bd_ht_info_buf, 0, sizeof(bss_ht->bd_ht_info_buf));
+ bss_ht->bd_ht_info_len = 0;
- pBssHT->bd_ht_spec_ver = HT_SPEC_VER_IEEE;
+ bss_ht->bd_ht_spec_ver = HT_SPEC_VER_IEEE;
- pBssHT->bd_rt2rt_aggregation = false;
- pBssHT->bd_rt2rt_long_slot_time = false;
- pBssHT->rt2rt_ht_mode = (enum rt_ht_capability)0;
+ bss_ht->bd_rt2rt_aggregation = false;
+ bss_ht->bd_rt2rt_long_slot_time = false;
+ bss_ht->rt2rt_ht_mode = (enum rt_ht_capability)0;
}
void ht_reset_self_and_save_peer_setting(struct rtllib_device *ieee,
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index cf75d1225501..3819a859710d 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1742,7 +1742,7 @@ void ht_construct_rt2rt_agg_element(struct rtllib_device *ieee,
u8 *posRT2RTAgg, u8 *len);
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 *pBssHT);
+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);
void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
--
2.30.2
Rename variable bRTSUseShortPreamble to rts_use_short_preamble
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index dcb78cd2e840..41373c013299 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -900,7 +900,7 @@ void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc,
pTxFwInfo->RtsBandwidth = 0;
pTxFwInfo->RtsSubcarrier = cb_desc->RTSSC;
pTxFwInfo->RtsShort = (pTxFwInfo->RtsHT == 0) ?
- (cb_desc->bRTSUseShortPreamble ? 1 : 0) :
+ (cb_desc->rts_use_short_preamble ? 1 : 0) :
(cb_desc->bRTSUseShortGI ? 1 : 0);
if (priv->current_chnl_bw == HT_CHANNEL_WIDTH_20_40) {
if (cb_desc->bPacketBW) {
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 525242b0313f..cf75d1225501 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -121,7 +121,7 @@ struct cb_desc {
u8 bRTSBW:1;
u8 bPacketBW:1;
- u8 bRTSUseShortPreamble:1;
+ u8 rts_use_short_preamble:1;
u8 bRTSUseShortGI:1;
u8 multicast:1;
u8 bBroadcast:1;
--
2.30.2
Rename variable bAllowAllDA to allow_all_da
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++--
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 41373c013299..e3276d2c3616 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -702,12 +702,12 @@ void rtl92e_link_change(struct net_device *dev)
}
}
-void rtl92e_set_monitor_mode(struct net_device *dev, bool bAllowAllDA,
+void rtl92e_set_monitor_mode(struct net_device *dev, bool allow_all_da,
bool WriteIntoReg)
{
struct r8192_priv *priv = rtllib_priv(dev);
- if (bAllowAllDA)
+ if (allow_all_da)
priv->receive_config |= RCR_AAP;
else
priv->receive_config &= ~RCR_AAP;
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
index 878c96236824..1224f190937e 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
@@ -21,7 +21,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val);
void rtl92e_get_eeprom_size(struct net_device *dev);
bool rtl92e_start_adapter(struct net_device *dev);
void rtl92e_link_change(struct net_device *dev);
-void rtl92e_set_monitor_mode(struct net_device *dev, bool bAllowAllDA,
+void rtl92e_set_monitor_mode(struct net_device *dev, bool allow_all_da,
bool WriteIntoReg);
void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc,
struct cb_desc *cb_desc, struct sk_buff *skb);
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 3819a859710d..393fff7e6a8d 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1477,7 +1477,7 @@ struct rtllib_device {
void (*set_hw_reg_handler)(struct net_device *dev, u8 variable, u8 *val);
void (*allow_all_dest_addr_handler)(struct net_device *dev,
- bool bAllowAllDA,
+ bool allow_all_da,
bool WriteIntoReg);
void (*rtllib_ips_leave_wq)(struct net_device *dev);
--
2.30.2
Rename variable WriteIntoReg to write_into_reg
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++--
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 2 +-
drivers/staging/rtl8192e/rtllib.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index e3276d2c3616..fdf8fc66939d 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -703,7 +703,7 @@ void rtl92e_link_change(struct net_device *dev)
}
void rtl92e_set_monitor_mode(struct net_device *dev, bool allow_all_da,
- bool WriteIntoReg)
+ bool write_into_reg)
{
struct r8192_priv *priv = rtllib_priv(dev);
@@ -712,7 +712,7 @@ void rtl92e_set_monitor_mode(struct net_device *dev, bool allow_all_da,
else
priv->receive_config &= ~RCR_AAP;
- if (WriteIntoReg)
+ if (write_into_reg)
rtl92e_writel(dev, RCR, priv->receive_config);
}
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
index 1224f190937e..9d9c5051c7fe 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
@@ -22,7 +22,7 @@ void rtl92e_get_eeprom_size(struct net_device *dev);
bool rtl92e_start_adapter(struct net_device *dev);
void rtl92e_link_change(struct net_device *dev);
void rtl92e_set_monitor_mode(struct net_device *dev, bool allow_all_da,
- bool WriteIntoReg);
+ bool write_into_reg);
void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc,
struct cb_desc *cb_desc, struct sk_buff *skb);
void rtl92e_fill_tx_cmd_desc(struct net_device *dev, struct tx_desc_cmd *entry,
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 393fff7e6a8d..0809af3fd041 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1478,7 +1478,7 @@ struct rtllib_device {
void (*allow_all_dest_addr_handler)(struct net_device *dev,
bool allow_all_da,
- bool WriteIntoReg);
+ bool write_into_reg);
void (*rtllib_ips_leave_wq)(struct net_device *dev);
void (*rtllib_ips_leave)(struct net_device *dev);
--
2.30.2
Replace bit shift operations with BIT macro, to fix warning
CHECK: Prefer using the BIT macro
Signed-off-by: Tree Davies <[email protected]>
---
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 0809af3fd041..5c00d663193f 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -419,19 +419,19 @@ enum _REG_PREAMBLE_MODE {
#define WLAN_AUTH_SHARED_KEY 1
#define WLAN_AUTH_LEAP 128
-#define WLAN_CAPABILITY_ESS (1<<0)
-#define WLAN_CAPABILITY_IBSS (1<<1)
-#define WLAN_CAPABILITY_PRIVACY (1<<4)
-#define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
-#define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
-
-#define RTLLIB_STATMASK_SIGNAL (1<<0)
-#define RTLLIB_STATMASK_RSSI (1<<1)
-#define RTLLIB_STATMASK_NOISE (1<<2)
+#define WLAN_CAPABILITY_ESS BIT(0)
+#define WLAN_CAPABILITY_IBSS BIT(1)
+#define WLAN_CAPABILITY_PRIVACY BIT(4)
+#define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
+#define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
+
+#define RTLLIB_STATMASK_SIGNAL BIT(0)
+#define RTLLIB_STATMASK_RSSI BIT(1)
+#define RTLLIB_STATMASK_NOISE BIT(2)
#define RTLLIB_STATMASK_WEMASK 0x7
-#define RTLLIB_CCK_MODULATION (1<<0)
-#define RTLLIB_OFDM_MODULATION (1<<1)
+#define RTLLIB_CCK_MODULATION BIT(0)
+#define RTLLIB_OFDM_MODULATION BIT(1)
#define RTLLIB_CCK_RATE_LEN 4
#define RTLLIB_CCK_RATE_1MB 0x02
@@ -518,11 +518,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 BIT(4)
+#define SEC_AUTH_MODE BIT(5)
+#define SEC_UNICAST_GROUP BIT(6)
+#define SEC_LEVEL BIT(7)
+#define SEC_ENABLED BIT(8)
#define SEC_LEVEL_0 0 /* None */
#define SEC_LEVEL_1 1 /* WEP 40 and 104 bit */
@@ -707,17 +707,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 BIT(0)
+#define NETWORK_HAS_OFDM BIT(1)
+#define NETWORK_HAS_CCK BIT(2)
/* QoS structure */
-#define NETWORK_HAS_QOS_PARAMETERS (1<<3)
-#define NETWORK_HAS_QOS_INFORMATION (1<<4)
+#define NETWORK_HAS_QOS_PARAMETERS BIT(3)
+#define NETWORK_HAS_QOS_INFORMATION BIT(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 BIT(10)
#define QOS_QUEUE_NUM 4
#define QOS_OUI_LEN 3
@@ -1007,8 +1007,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 BIT(0)
+#define CFG_RTLLIB_COMPUTE_FCS BIT(1)
struct tx_pending {
int frag;
@@ -1497,32 +1497,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 BIT(2)
/* Perform authentication and association handshake */
-#define IEEE_SOFTMAC_ASSOCIATE (1<<3)
+#define IEEE_SOFTMAC_ASSOCIATE BIT(3)
/* Generate probe requests */
-#define IEEE_SOFTMAC_PROBERQ (1<<4)
+#define IEEE_SOFTMAC_PROBERQ BIT(4)
/* Generate response to probe requests */
-#define IEEE_SOFTMAC_PROBERS (1<<5)
+#define IEEE_SOFTMAC_PROBERS BIT(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 BIT(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 BIT(8)
/* Generate beacons. The stack will enqueue beacons
* to the card
*/
-#define IEEE_SOFTMAC_BEACONS (1<<6)
+#define IEEE_SOFTMAC_BEACONS BIT(6)
static inline void *rtllib_priv(struct net_device *dev)
{
--
2.30.2
Thanks!
Reviewed-by: Dan Carpenter <[email protected]>
regards,
dan carpenter
Hi Tree,
kernel test robot noticed the following build warnings:
[auto build test WARNING on staging/staging-testing]
url: https://github.com/intel-lab-lkp/linux/commits/Tree-Davies/Staging-rtl8192e-Rename-variable-ReturnPoint/20240311-075949
base: staging/staging-testing
patch link: https://lore.kernel.org/r/20240310235552.4217-12-tdavies%40darkphysics.net
patch subject: [PATCH 11/11] Staging: rtl8192e: Implement BIT macro for bit shift ops
config: arc-allmodconfig (https://download.01.org/0day-ci/archive/20240311/[email protected]/config)
compiler: arceb-elf-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240311/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
In file included from drivers/staging/rtl8192e/rtllib_module.c:35:
>> drivers/staging/rtl8192e/rtllib.h:422: warning: "WLAN_CAPABILITY_ESS" redefined
422 | #define WLAN_CAPABILITY_ESS BIT(0)
|
In file included from include/net/cfg80211.h:23,
from drivers/staging/rtl8192e/rtllib.h:40:
include/linux/ieee80211.h:3218: note: this is the location of the previous definition
3218 | #define WLAN_CAPABILITY_ESS (1<<0)
|
>> drivers/staging/rtl8192e/rtllib.h:423: warning: "WLAN_CAPABILITY_IBSS" redefined
423 | #define WLAN_CAPABILITY_IBSS BIT(1)
|
include/linux/ieee80211.h:3219: note: this is the location of the previous definition
3219 | #define WLAN_CAPABILITY_IBSS (1<<1)
|
>> drivers/staging/rtl8192e/rtllib.h:424: warning: "WLAN_CAPABILITY_PRIVACY" redefined
424 | #define WLAN_CAPABILITY_PRIVACY BIT(4)
|
include/linux/ieee80211.h:3231: note: this is the location of the previous definition
3231 | #define WLAN_CAPABILITY_PRIVACY (1<<4)
|
>> drivers/staging/rtl8192e/rtllib.h:425: warning: "WLAN_CAPABILITY_SHORT_PREAMBLE" redefined
425 | #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
|
include/linux/ieee80211.h:3232: note: this is the location of the previous definition
3232 | #define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
|
>> drivers/staging/rtl8192e/rtllib.h:426: warning: "WLAN_CAPABILITY_SHORT_SLOT_TIME" redefined
426 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
|
include/linux/ieee80211.h:3239: note: this is the location of the previous definition
3239 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
|
--
In file included from drivers/staging/rtl8192e/rtllib_rx.c:36:
>> drivers/staging/rtl8192e/rtllib.h:422: warning: "WLAN_CAPABILITY_ESS" redefined
422 | #define WLAN_CAPABILITY_ESS BIT(0)
|
In file included from include/net/cfg80211.h:23,
from drivers/staging/rtl8192e/rtllib.h:40:
include/linux/ieee80211.h:3218: note: this is the location of the previous definition
3218 | #define WLAN_CAPABILITY_ESS (1<<0)
|
>> drivers/staging/rtl8192e/rtllib.h:423: warning: "WLAN_CAPABILITY_IBSS" redefined
423 | #define WLAN_CAPABILITY_IBSS BIT(1)
|
include/linux/ieee80211.h:3219: note: this is the location of the previous definition
3219 | #define WLAN_CAPABILITY_IBSS (1<<1)
|
>> drivers/staging/rtl8192e/rtllib.h:424: warning: "WLAN_CAPABILITY_PRIVACY" redefined
424 | #define WLAN_CAPABILITY_PRIVACY BIT(4)
|
include/linux/ieee80211.h:3231: note: this is the location of the previous definition
3231 | #define WLAN_CAPABILITY_PRIVACY (1<<4)
|
>> drivers/staging/rtl8192e/rtllib.h:425: warning: "WLAN_CAPABILITY_SHORT_PREAMBLE" redefined
425 | #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
|
include/linux/ieee80211.h:3232: note: this is the location of the previous definition
3232 | #define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
|
>> drivers/staging/rtl8192e/rtllib.h:426: warning: "WLAN_CAPABILITY_SHORT_SLOT_TIME" redefined
426 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
|
include/linux/ieee80211.h:3239: note: this is the location of the previous definition
3239 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
|
during RTL pass: mach
drivers/staging/rtl8192e/rtllib_rx.c: In function 'rtllib_rx_decrypt':
drivers/staging/rtl8192e/rtllib_rx.c:1141:1: internal compiler error: in arc_ifcvt, at config/arc/arc.cc:9703
1141 | }
| ^
0x5b78c1 arc_ifcvt
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/config/arc/arc.cc:9703
0xe431b4 arc_reorg
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/config/arc/arc.cc:8552
0xaed299 execute
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/reorg.cc:3927
Please submit a full bug report, with preprocessed source (by using -freport-bug).
Please include the complete backtrace with any bug report.
See <https://gcc.gnu.org/bugs/> for instructions.
--
In file included from drivers/staging/rtl8192e/rtl819x_BAProc.c:10:
>> drivers/staging/rtl8192e/rtllib.h:422: warning: "WLAN_CAPABILITY_ESS" redefined
422 | #define WLAN_CAPABILITY_ESS BIT(0)
|
In file included from include/net/cfg80211.h:23,
from drivers/staging/rtl8192e/rtllib.h:40:
include/linux/ieee80211.h:3218: note: this is the location of the previous definition
3218 | #define WLAN_CAPABILITY_ESS (1<<0)
|
>> drivers/staging/rtl8192e/rtllib.h:423: warning: "WLAN_CAPABILITY_IBSS" redefined
423 | #define WLAN_CAPABILITY_IBSS BIT(1)
|
include/linux/ieee80211.h:3219: note: this is the location of the previous definition
3219 | #define WLAN_CAPABILITY_IBSS (1<<1)
|
>> drivers/staging/rtl8192e/rtllib.h:424: warning: "WLAN_CAPABILITY_PRIVACY" redefined
424 | #define WLAN_CAPABILITY_PRIVACY BIT(4)
|
include/linux/ieee80211.h:3231: note: this is the location of the previous definition
3231 | #define WLAN_CAPABILITY_PRIVACY (1<<4)
|
>> drivers/staging/rtl8192e/rtllib.h:425: warning: "WLAN_CAPABILITY_SHORT_PREAMBLE" redefined
425 | #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
|
include/linux/ieee80211.h:3232: note: this is the location of the previous definition
3232 | #define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
|
>> drivers/staging/rtl8192e/rtllib.h:426: warning: "WLAN_CAPABILITY_SHORT_SLOT_TIME" redefined
426 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
|
include/linux/ieee80211.h:3239: note: this is the location of the previous definition
3239 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
|
during RTL pass: mach
drivers/staging/rtl8192e/rtl819x_BAProc.c: In function 'rtllib_send_DELBA':
drivers/staging/rtl8192e/rtl819x_BAProc.c:212:1: internal compiler error: in arc_ifcvt, at config/arc/arc.cc:9703
212 | }
| ^
0x5b78c1 arc_ifcvt
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/config/arc/arc.cc:9703
0xe431b4 arc_reorg
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/config/arc/arc.cc:8552
0xaed299 execute
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/reorg.cc:3927
Please submit a full bug report, with preprocessed source (by using -freport-bug).
Please include the complete backtrace with any bug report.
See <https://gcc.gnu.org/bugs/> for instructions.
--
In file included from drivers/staging/rtl8192e/rtllib_crypt_ccmp.c:17:
>> drivers/staging/rtl8192e/rtllib.h:422: warning: "WLAN_CAPABILITY_ESS" redefined
422 | #define WLAN_CAPABILITY_ESS BIT(0)
|
In file included from include/net/cfg80211.h:23,
from drivers/staging/rtl8192e/rtllib.h:40:
include/linux/ieee80211.h:3218: note: this is the location of the previous definition
3218 | #define WLAN_CAPABILITY_ESS (1<<0)
|
>> drivers/staging/rtl8192e/rtllib.h:423: warning: "WLAN_CAPABILITY_IBSS" redefined
423 | #define WLAN_CAPABILITY_IBSS BIT(1)
|
include/linux/ieee80211.h:3219: note: this is the location of the previous definition
3219 | #define WLAN_CAPABILITY_IBSS (1<<1)
|
>> drivers/staging/rtl8192e/rtllib.h:424: warning: "WLAN_CAPABILITY_PRIVACY" redefined
424 | #define WLAN_CAPABILITY_PRIVACY BIT(4)
|
include/linux/ieee80211.h:3231: note: this is the location of the previous definition
3231 | #define WLAN_CAPABILITY_PRIVACY (1<<4)
|
>> drivers/staging/rtl8192e/rtllib.h:425: warning: "WLAN_CAPABILITY_SHORT_PREAMBLE" redefined
425 | #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
|
include/linux/ieee80211.h:3232: note: this is the location of the previous definition
3232 | #define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
|
>> drivers/staging/rtl8192e/rtllib.h:426: warning: "WLAN_CAPABILITY_SHORT_SLOT_TIME" redefined
426 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
|
include/linux/ieee80211.h:3239: note: this is the location of the previous definition
3239 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
|
during RTL pass: mach
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c: In function 'rtllib_ccmp_decrypt':
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c:310:1: internal compiler error: in arc_ifcvt, at config/arc/arc.cc:9703
310 | }
| ^
0x5b78c1 arc_ifcvt
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/config/arc/arc.cc:9703
0xe431b4 arc_reorg
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/config/arc/arc.cc:8552
0xaed299 execute
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/reorg.cc:3927
Please submit a full bug report, with preprocessed source (by using -freport-bug).
Please include the complete backtrace with any bug report.
See <https://gcc.gnu.org/bugs/> for instructions.
--
In file included from drivers/staging/rtl8192e/rtllib_crypt_tkip.c:23:
>> drivers/staging/rtl8192e/rtllib.h:422: warning: "WLAN_CAPABILITY_ESS" redefined
422 | #define WLAN_CAPABILITY_ESS BIT(0)
|
In file included from include/net/cfg80211.h:23,
from drivers/staging/rtl8192e/rtllib.h:40:
include/linux/ieee80211.h:3218: note: this is the location of the previous definition
3218 | #define WLAN_CAPABILITY_ESS (1<<0)
|
>> drivers/staging/rtl8192e/rtllib.h:423: warning: "WLAN_CAPABILITY_IBSS" redefined
423 | #define WLAN_CAPABILITY_IBSS BIT(1)
|
include/linux/ieee80211.h:3219: note: this is the location of the previous definition
3219 | #define WLAN_CAPABILITY_IBSS (1<<1)
|
>> drivers/staging/rtl8192e/rtllib.h:424: warning: "WLAN_CAPABILITY_PRIVACY" redefined
424 | #define WLAN_CAPABILITY_PRIVACY BIT(4)
|
include/linux/ieee80211.h:3231: note: this is the location of the previous definition
3231 | #define WLAN_CAPABILITY_PRIVACY (1<<4)
|
>> drivers/staging/rtl8192e/rtllib.h:425: warning: "WLAN_CAPABILITY_SHORT_PREAMBLE" redefined
425 | #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
|
include/linux/ieee80211.h:3232: note: this is the location of the previous definition
3232 | #define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
|
>> drivers/staging/rtl8192e/rtllib.h:426: warning: "WLAN_CAPABILITY_SHORT_SLOT_TIME" redefined
426 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
|
include/linux/ieee80211.h:3239: note: this is the location of the previous definition
3239 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
|
during RTL pass: mach
drivers/staging/rtl8192e/rtllib_crypt_tkip.c: In function 'rtllib_tkip_decrypt':
drivers/staging/rtl8192e/rtllib_crypt_tkip.c:437:1: internal compiler error: in arc_ifcvt, at config/arc/arc.cc:9703
437 | }
| ^
0x5b78c1 arc_ifcvt
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/config/arc/arc.cc:9703
0xe431b4 arc_reorg
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/config/arc/arc.cc:8552
0xaed299 execute
/tmp/build-crosstools-gcc-13.2.0-binutils-2.41/gcc/gcc-13.2.0/gcc/reorg.cc:3927
Please submit a full bug report, with preprocessed source (by using -freport-bug).
Please include the complete backtrace with any bug report.
See <https://gcc.gnu.org/bugs/> for instructions.
--
In file included from drivers/staging/rtl8192e/rtl8192e/rtl_core.h:35,
from drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:10:
>> drivers/staging/rtl8192e/rtl8192e/../rtllib.h:422: warning: "WLAN_CAPABILITY_ESS" redefined
422 | #define WLAN_CAPABILITY_ESS BIT(0)
|
In file included from include/net/cfg80211.h:23,
from drivers/staging/rtl8192e/rtl8192e/../rtllib.h:40:
include/linux/ieee80211.h:3218: note: this is the location of the previous definition
3218 | #define WLAN_CAPABILITY_ESS (1<<0)
|
>> drivers/staging/rtl8192e/rtl8192e/../rtllib.h:423: warning: "WLAN_CAPABILITY_IBSS" redefined
423 | #define WLAN_CAPABILITY_IBSS BIT(1)
|
include/linux/ieee80211.h:3219: note: this is the location of the previous definition
3219 | #define WLAN_CAPABILITY_IBSS (1<<1)
|
>> drivers/staging/rtl8192e/rtl8192e/../rtllib.h:424: warning: "WLAN_CAPABILITY_PRIVACY" redefined
424 | #define WLAN_CAPABILITY_PRIVACY BIT(4)
|
include/linux/ieee80211.h:3231: note: this is the location of the previous definition
3231 | #define WLAN_CAPABILITY_PRIVACY (1<<4)
|
>> drivers/staging/rtl8192e/rtl8192e/../rtllib.h:425: warning: "WLAN_CAPABILITY_SHORT_PREAMBLE" redefined
425 | #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
|
include/linux/ieee80211.h:3232: note: this is the location of the previous definition
3232 | #define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
|
>> drivers/staging/rtl8192e/rtl8192e/../rtllib.h:426: warning: "WLAN_CAPABILITY_SHORT_SLOT_TIME" redefined
426 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
|
include/linux/ieee80211.h:3239: note: this is the location of the previous definition
3239 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
|
vim +/WLAN_CAPABILITY_ESS +422 drivers/staging/rtl8192e/rtllib.h
421
> 422 #define WLAN_CAPABILITY_ESS BIT(0)
> 423 #define WLAN_CAPABILITY_IBSS BIT(1)
> 424 #define WLAN_CAPABILITY_PRIVACY BIT(4)
> 425 #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
> 426 #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
427
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Tree,
kernel test robot noticed the following build warnings:
[auto build test WARNING on staging/staging-testing]
url: https://github.com/intel-lab-lkp/linux/commits/Tree-Davies/Staging-rtl8192e-Rename-variable-ReturnPoint/20240311-075949
base: staging/staging-testing
patch link: https://lore.kernel.org/r/20240310235552.4217-12-tdavies%40darkphysics.net
patch subject: [PATCH 11/11] Staging: rtl8192e: Implement BIT macro for bit shift ops
config: powerpc-allyesconfig (https://download.01.org/0day-ci/archive/20240311/[email protected]/config)
compiler: clang version 19.0.0git (https://github.com/llvm/llvm-project 503c55e17037436dcd45ac69dea8967e67e3f5e8)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240311/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
In file included from drivers/staging/rtl8192e/rtllib_module.c:18:
In file included from include/linux/if_arp.h:22:
In file included from include/linux/skbuff.h:17:
In file included from include/linux/bvec.h:10:
In file included from include/linux/highmem.h:8:
In file included from include/linux/cacheflush.h:5:
In file included from arch/powerpc/include/asm/cacheflush.h:7:
In file included from include/linux/mm.h:2188:
include/linux/vmstat.h:508:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
508 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
509 | item];
| ~~~~
include/linux/vmstat.h:515:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
515 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
516 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:522:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
522 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:527:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
527 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
528 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:536:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
536 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
537 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/staging/rtl8192e/rtllib_module.c:35:
>> drivers/staging/rtl8192e/rtllib.h:422:9: warning: 'WLAN_CAPABILITY_ESS' macro redefined [-Wmacro-redefined]
422 | #define WLAN_CAPABILITY_ESS BIT(0)
| ^
include/linux/ieee80211.h:3218:9: note: previous definition is here
3218 | #define WLAN_CAPABILITY_ESS (1<<0)
| ^
In file included from drivers/staging/rtl8192e/rtllib_module.c:35:
>> drivers/staging/rtl8192e/rtllib.h:423:9: warning: 'WLAN_CAPABILITY_IBSS' macro redefined [-Wmacro-redefined]
423 | #define WLAN_CAPABILITY_IBSS BIT(1)
| ^
include/linux/ieee80211.h:3219:9: note: previous definition is here
3219 | #define WLAN_CAPABILITY_IBSS (1<<1)
| ^
In file included from drivers/staging/rtl8192e/rtllib_module.c:35:
>> drivers/staging/rtl8192e/rtllib.h:424:9: warning: 'WLAN_CAPABILITY_PRIVACY' macro redefined [-Wmacro-redefined]
424 | #define WLAN_CAPABILITY_PRIVACY BIT(4)
| ^
include/linux/ieee80211.h:3231:9: note: previous definition is here
3231 | #define WLAN_CAPABILITY_PRIVACY (1<<4)
| ^
In file included from drivers/staging/rtl8192e/rtllib_module.c:35:
>> drivers/staging/rtl8192e/rtllib.h:425:9: warning: 'WLAN_CAPABILITY_SHORT_PREAMBLE' macro redefined [-Wmacro-redefined]
425 | #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
| ^
include/linux/ieee80211.h:3232:9: note: previous definition is here
3232 | #define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
| ^
In file included from drivers/staging/rtl8192e/rtllib_module.c:35:
>> drivers/staging/rtl8192e/rtllib.h:426:9: warning: 'WLAN_CAPABILITY_SHORT_SLOT_TIME' macro redefined [-Wmacro-redefined]
426 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
| ^
include/linux/ieee80211.h:3239:9: note: previous definition is here
3239 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
| ^
10 warnings generated.
--
In file included from drivers/staging/rtl8192e/rtllib_crypt_tkip.c:15:
In file included from include/linux/skbuff.h:17:
In file included from include/linux/bvec.h:10:
In file included from include/linux/highmem.h:8:
In file included from include/linux/cacheflush.h:5:
In file included from arch/powerpc/include/asm/cacheflush.h:7:
In file included from include/linux/mm.h:2188:
include/linux/vmstat.h:508:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
508 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
509 | item];
| ~~~~
include/linux/vmstat.h:515:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
515 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
516 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:522:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
522 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:527:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
527 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
528 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:536:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
536 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
537 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/staging/rtl8192e/rtllib_crypt_tkip.c:23:
>> drivers/staging/rtl8192e/rtllib.h:422:9: warning: 'WLAN_CAPABILITY_ESS' macro redefined [-Wmacro-redefined]
422 | #define WLAN_CAPABILITY_ESS BIT(0)
| ^
include/linux/ieee80211.h:3218:9: note: previous definition is here
3218 | #define WLAN_CAPABILITY_ESS (1<<0)
| ^
In file included from drivers/staging/rtl8192e/rtllib_crypt_tkip.c:23:
>> drivers/staging/rtl8192e/rtllib.h:423:9: warning: 'WLAN_CAPABILITY_IBSS' macro redefined [-Wmacro-redefined]
423 | #define WLAN_CAPABILITY_IBSS BIT(1)
| ^
include/linux/ieee80211.h:3219:9: note: previous definition is here
3219 | #define WLAN_CAPABILITY_IBSS (1<<1)
| ^
In file included from drivers/staging/rtl8192e/rtllib_crypt_tkip.c:23:
>> drivers/staging/rtl8192e/rtllib.h:424:9: warning: 'WLAN_CAPABILITY_PRIVACY' macro redefined [-Wmacro-redefined]
424 | #define WLAN_CAPABILITY_PRIVACY BIT(4)
| ^
include/linux/ieee80211.h:3231:9: note: previous definition is here
3231 | #define WLAN_CAPABILITY_PRIVACY (1<<4)
| ^
In file included from drivers/staging/rtl8192e/rtllib_crypt_tkip.c:23:
>> drivers/staging/rtl8192e/rtllib.h:425:9: warning: 'WLAN_CAPABILITY_SHORT_PREAMBLE' macro redefined [-Wmacro-redefined]
425 | #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
| ^
include/linux/ieee80211.h:3232:9: note: previous definition is here
3232 | #define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
| ^
In file included from drivers/staging/rtl8192e/rtllib_crypt_tkip.c:23:
>> drivers/staging/rtl8192e/rtllib.h:426:9: warning: 'WLAN_CAPABILITY_SHORT_SLOT_TIME' macro redefined [-Wmacro-redefined]
426 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
| ^
include/linux/ieee80211.h:3239:9: note: previous definition is here
3239 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
| ^
drivers/staging/rtl8192e/rtllib_crypt_tkip.c:641:7: warning: variable 'iv32' set but not used [-Wunused-but-set-variable]
641 | u32 iv32 = tkey->tx_iv32;
| ^
11 warnings generated.
--
In file included from drivers/staging/rtl8192e/rtllib_softmac_wx.c:16:
>> drivers/staging/rtl8192e/rtllib.h:422:9: warning: 'WLAN_CAPABILITY_ESS' macro redefined [-Wmacro-redefined]
422 | #define WLAN_CAPABILITY_ESS BIT(0)
| ^
include/linux/ieee80211.h:3218:9: note: previous definition is here
3218 | #define WLAN_CAPABILITY_ESS (1<<0)
| ^
In file included from drivers/staging/rtl8192e/rtllib_softmac_wx.c:16:
>> drivers/staging/rtl8192e/rtllib.h:423:9: warning: 'WLAN_CAPABILITY_IBSS' macro redefined [-Wmacro-redefined]
423 | #define WLAN_CAPABILITY_IBSS BIT(1)
| ^
include/linux/ieee80211.h:3219:9: note: previous definition is here
3219 | #define WLAN_CAPABILITY_IBSS (1<<1)
| ^
In file included from drivers/staging/rtl8192e/rtllib_softmac_wx.c:16:
>> drivers/staging/rtl8192e/rtllib.h:424:9: warning: 'WLAN_CAPABILITY_PRIVACY' macro redefined [-Wmacro-redefined]
424 | #define WLAN_CAPABILITY_PRIVACY BIT(4)
| ^
include/linux/ieee80211.h:3231:9: note: previous definition is here
3231 | #define WLAN_CAPABILITY_PRIVACY (1<<4)
| ^
In file included from drivers/staging/rtl8192e/rtllib_softmac_wx.c:16:
>> drivers/staging/rtl8192e/rtllib.h:425:9: warning: 'WLAN_CAPABILITY_SHORT_PREAMBLE' macro redefined [-Wmacro-redefined]
425 | #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
| ^
include/linux/ieee80211.h:3232:9: note: previous definition is here
3232 | #define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
| ^
In file included from drivers/staging/rtl8192e/rtllib_softmac_wx.c:16:
>> drivers/staging/rtl8192e/rtllib.h:426:9: warning: 'WLAN_CAPABILITY_SHORT_SLOT_TIME' macro redefined [-Wmacro-redefined]
426 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
| ^
include/linux/ieee80211.h:3239:9: note: previous definition is here
3239 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
| ^
5 warnings generated.
--
In file included from drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:10:
In file included from drivers/staging/rtl8192e/rtl8192e/rtl_core.h:18:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:11:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:24:
In file included from include/linux/mm.h:2188:
include/linux/vmstat.h:508:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
508 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
509 | item];
| ~~~~
include/linux/vmstat.h:515:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
515 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
516 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:522:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
522 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:527:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
527 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
528 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:536:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
536 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
537 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:10:
In file included from drivers/staging/rtl8192e/rtl8192e/rtl_core.h:35:
>> drivers/staging/rtl8192e/rtl8192e/../rtllib.h:422:9: warning: 'WLAN_CAPABILITY_ESS' macro redefined [-Wmacro-redefined]
422 | #define WLAN_CAPABILITY_ESS BIT(0)
| ^
include/linux/ieee80211.h:3218:9: note: previous definition is here
3218 | #define WLAN_CAPABILITY_ESS (1<<0)
| ^
In file included from drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:10:
In file included from drivers/staging/rtl8192e/rtl8192e/rtl_core.h:35:
>> drivers/staging/rtl8192e/rtl8192e/../rtllib.h:423:9: warning: 'WLAN_CAPABILITY_IBSS' macro redefined [-Wmacro-redefined]
423 | #define WLAN_CAPABILITY_IBSS BIT(1)
| ^
include/linux/ieee80211.h:3219:9: note: previous definition is here
3219 | #define WLAN_CAPABILITY_IBSS (1<<1)
| ^
In file included from drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:10:
In file included from drivers/staging/rtl8192e/rtl8192e/rtl_core.h:35:
>> drivers/staging/rtl8192e/rtl8192e/../rtllib.h:424:9: warning: 'WLAN_CAPABILITY_PRIVACY' macro redefined [-Wmacro-redefined]
424 | #define WLAN_CAPABILITY_PRIVACY BIT(4)
| ^
include/linux/ieee80211.h:3231:9: note: previous definition is here
3231 | #define WLAN_CAPABILITY_PRIVACY (1<<4)
| ^
In file included from drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:10:
In file included from drivers/staging/rtl8192e/rtl8192e/rtl_core.h:35:
>> drivers/staging/rtl8192e/rtl8192e/../rtllib.h:425:9: warning: 'WLAN_CAPABILITY_SHORT_PREAMBLE' macro redefined [-Wmacro-redefined]
425 | #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
| ^
include/linux/ieee80211.h:3232:9: note: previous definition is here
3232 | #define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
| ^
In file included from drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:10:
In file included from drivers/staging/rtl8192e/rtl8192e/rtl_core.h:35:
>> drivers/staging/rtl8192e/rtl8192e/../rtllib.h:426:9: warning: 'WLAN_CAPABILITY_SHORT_SLOT_TIME' macro redefined [-Wmacro-redefined]
426 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
| ^
include/linux/ieee80211.h:3239:9: note: previous definition is here
3239 | #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
| ^
10 warnings generated.
vim +/WLAN_CAPABILITY_ESS +422 drivers/staging/rtl8192e/rtllib.h
421
> 422 #define WLAN_CAPABILITY_ESS BIT(0)
> 423 #define WLAN_CAPABILITY_IBSS BIT(1)
> 424 #define WLAN_CAPABILITY_PRIVACY BIT(4)
> 425 #define WLAN_CAPABILITY_SHORT_PREAMBLE BIT(5)
> 426 #define WLAN_CAPABILITY_SHORT_SLOT_TIME BIT(10)
427
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
On Mon, Mar 25, 2024 at 07:01:50PM +0100, Greg KH wrote:
> On Sun, Mar 10, 2024 at 04:55:41PM -0700, Tree Davies wrote:
> > 10/11 patches in this series rename variables to fix camelCase style
> > guide violations. The 11th patch implements the use of the BIT macro
> > instead of regular bit shift operations.
> >
> > MOTE: Because patch #11 changes DEFINEs the compiler issues
> > redefinition warnings. I don't know how to address these as part
> > of this submission.
> >
> > All changes Tested on Hardware
>
> This patch series blows up the build, as the kernel test bot says, so I
> can't apply it, sorry.
Ah, it's just the last patch, I applied the first 10 now, thanks.
greg k-h
On Sun, Mar 10, 2024 at 04:55:41PM -0700, Tree Davies wrote:
> 10/11 patches in this series rename variables to fix camelCase style
> guide violations. The 11th patch implements the use of the BIT macro
> instead of regular bit shift operations.
>
> MOTE: Because patch #11 changes DEFINEs the compiler issues
> redefinition warnings. I don't know how to address these as part
> of this submission.
>
> All changes Tested on Hardware
This patch series blows up the build, as the kernel test bot says, so I
can't apply it, sorry.
greg k-h