* [PATCH v2 1/3] staging: rtl8723bs: add spaces around operators in rtl8723b_cmd.c
From: Kai Cheng Jin @ 2026-06-19 20:15 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, error27, Kai Cheng Jin
In-Reply-To: <ajT4n4p7CKiApCPF@stanley.mountain>
Add missing spaces around arithmetic and bitwise operators to
follow kernel coding style, as reported by checkpatch.pl.
Signed-off-by: Kai Cheng Jin <kj@kylejin.com>
---
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 88 ++++++++++----------
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
index c35c7f1c38ef..d92dde57b720 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
@@ -70,23 +70,23 @@ s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmd
goto exit;
if (CmdLen <= 3)
- memcpy((u8 *)(&h2c_cmd)+1, pCmdBuffer, CmdLen);
+ memcpy((u8 *)(&h2c_cmd) + 1, pCmdBuffer, CmdLen);
else {
- memcpy((u8 *)(&h2c_cmd)+1, pCmdBuffer, 3);
- memcpy((u8 *)(&h2c_cmd_ex), pCmdBuffer+3, CmdLen-3);
-/* *(u8 *)(&h2c_cmd) |= BIT(7); */
+ memcpy((u8 *)(&h2c_cmd) + 1, pCmdBuffer, 3);
+ memcpy((u8 *)(&h2c_cmd_ex), pCmdBuffer + 3, CmdLen - 3);
+/* *(u8 *)(&h2c_cmd) |= BIT(7); */
}
*(u8 *)(&h2c_cmd) |= ElementID;
if (CmdLen > 3) {
- msgbox_ex_addr = REG_HMEBOX_EXT0_8723B + (h2c_box_num*RTL8723B_EX_MESSAGE_BOX_SIZE);
+ msgbox_ex_addr = REG_HMEBOX_EXT0_8723B + (h2c_box_num * RTL8723B_EX_MESSAGE_BOX_SIZE);
rtw_write32(padapter, msgbox_ex_addr, h2c_cmd_ex);
}
- msgbox_addr = REG_HMEBOX_0 + (h2c_box_num*MESSAGE_BOX_SIZE);
+ msgbox_addr = REG_HMEBOX_0 + (h2c_box_num * MESSAGE_BOX_SIZE);
rtw_write32(padapter, msgbox_addr, h2c_cmd);
- pHalData->LastHMEBoxNum = (h2c_box_num+1) % MAX_H2C_BOX_NUMS;
+ pHalData->LastHMEBoxNum = (h2c_box_num + 1) % MAX_H2C_BOX_NUMS;
} while (0);
@@ -139,9 +139,9 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)
pframe += 2;
pktlen += 2;
- if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
pktlen += cur_network->ie_length - sizeof(struct ndis_802_11_fix_ie);
- memcpy(pframe, cur_network->ies+sizeof(struct ndis_802_11_fix_ie), pktlen);
+ memcpy(pframe, cur_network->ies + sizeof(struct ndis_802_11_fix_ie), pktlen);
goto _ConstructBeacon;
}
@@ -158,7 +158,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)
/* DS parameter set */
pframe = rtw_set_ie(pframe, WLAN_EID_DS_PARAMS, 1, (unsigned char *)&(cur_network->configuration.ds_config), &pktlen);
- if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
u32 ATIMWindow;
/* IBSS Parameter Set... */
/* ATIMWindow = cur->configuration.ATIMWindow; */
@@ -324,7 +324,7 @@ void rtl8723b_set_rssi_cmd(struct adapter *padapter, u8 *param)
{
u8 u1H2CRssiSettingParm[H2C_RSSI_SETTING_LEN] = {0};
u8 mac_id = *param;
- u8 rssi = *(param+2);
+ u8 rssi = *(param + 2);
u8 uldl_state = 0;
SET_8723B_H2CCMD_RSSI_SETTING_MACID(u1H2CRssiSettingParm, mac_id);
@@ -343,7 +343,7 @@ void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 psmode)
u8 PowerState = 0, awake_intvl = 1, byte5 = 0, rlbm = 0;
if (pwrpriv->dtim > 0 && pwrpriv->dtim < 16)
- awake_intvl = pwrpriv->dtim+1;/* DTIM = (awake_intvl - 1) */
+ awake_intvl = pwrpriv->dtim + 1;/* DTIM = (awake_intvl - 1) */
else
awake_intvl = 3;/* DTIM =2 */
@@ -394,7 +394,7 @@ void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 psmode)
pmlmeext->DrvBcnTimeOut = 0xff;
for (i = 0; i < 9; i++) {
- pmlmeext->bcn_delay_ratio[i] = (pmlmeext->bcn_delay_cnt[i]*100)/pmlmeext->bcn_cnt;
+ pmlmeext->bcn_delay_ratio[i] = (pmlmeext->bcn_delay_cnt[i] * 100) / pmlmeext->bcn_cnt;
ratio_20_delay += pmlmeext->bcn_delay_ratio[i];
ratio_80_delay += pmlmeext->bcn_delay_ratio[i];
@@ -493,7 +493,7 @@ static void rtl8723b_set_FwRsvdPagePkt(
pmlmeinfo = &pmlmeext->mlmext_info;
RsvdPageNum = BCNQ_PAGE_NUM_8723B + WOWLAN_PAGE_NUM_8723B;
- MaxRsvdPageBufSize = RsvdPageNum*PageSize;
+ MaxRsvdPageBufSize = RsvdPageNum * PageSize;
pcmdframe = rtw_alloc_cmdxmitframe(pxmitpriv);
if (!pcmdframe)
@@ -515,18 +515,18 @@ static void rtl8723b_set_FwRsvdPagePkt(
TotalPageNum += CurtPktPageNum;
- BufIndex += (CurtPktPageNum*PageSize);
+ BufIndex += (CurtPktPageNum * PageSize);
/* 3 (2) ps-poll */
RsvdPageLoc.LocPsPoll = TotalPageNum;
ConstructPSPoll(padapter, &ReservedPagePacket[BufIndex], &PSPollLength);
- rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], PSPollLength, true, false, false);
+ rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex - TxDescLen], PSPollLength, true, false, false);
CurtPktPageNum = (u8)PageNum_128(TxDescLen + PSPollLength);
TotalPageNum += CurtPktPageNum;
- BufIndex += (CurtPktPageNum*PageSize);
+ BufIndex += (CurtPktPageNum * PageSize);
/* 3 (3) null data */
RsvdPageLoc.LocNullData = TotalPageNum;
@@ -537,13 +537,13 @@ static void rtl8723b_set_FwRsvdPagePkt(
get_my_bssid(&pmlmeinfo->network),
false, 0, 0, false
);
- rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], NullDataLength, false, false, false);
+ rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex - TxDescLen], NullDataLength, false, false, false);
CurtPktPageNum = (u8)PageNum_128(TxDescLen + NullDataLength);
TotalPageNum += CurtPktPageNum;
- BufIndex += (CurtPktPageNum*PageSize);
+ BufIndex += (CurtPktPageNum * PageSize);
/* 3 (5) Qos null data */
RsvdPageLoc.LocQosNull = TotalPageNum;
@@ -554,13 +554,13 @@ static void rtl8723b_set_FwRsvdPagePkt(
get_my_bssid(&pmlmeinfo->network),
true, 0, 0, false
);
- rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], QosNullLength, false, false, false);
+ rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex - TxDescLen], QosNullLength, false, false, false);
CurtPktPageNum = (u8)PageNum_128(TxDescLen + QosNullLength);
TotalPageNum += CurtPktPageNum;
- BufIndex += (CurtPktPageNum*PageSize);
+ BufIndex += (CurtPktPageNum * PageSize);
/* 3 (6) BT Qos null data */
RsvdPageLoc.LocBTQosNull = TotalPageNum;
@@ -571,13 +571,13 @@ static void rtl8723b_set_FwRsvdPagePkt(
get_my_bssid(&pmlmeinfo->network),
true, 0, 0, false
);
- rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], BTQosNullLength, false, true, false);
+ rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex - TxDescLen], BTQosNullLength, false, true, false);
CurtPktPageNum = (u8)PageNum_128(TxDescLen + BTQosNullLength);
TotalPageNum += CurtPktPageNum;
- BufIndex += (CurtPktPageNum*PageSize);
+ BufIndex += (CurtPktPageNum * PageSize);
TotalPacketLen = BufIndex + BTQosNullLength;
@@ -618,12 +618,12 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)
/* We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */
/* Suggested by filen. Added by tynli. */
- rtw_write16(padapter, REG_BCN_PSR_RPT, (0xC000|pmlmeinfo->aid));
+ rtw_write16(padapter, REG_BCN_PSR_RPT, (0xC000 | pmlmeinfo->aid));
/* set REG_CR bit 8 */
- v8 = rtw_read8(padapter, REG_CR+1);
+ v8 = rtw_read8(padapter, REG_CR + 1);
v8 |= BIT(0); /* ENSWBCN */
- rtw_write8(padapter, REG_CR+1, v8);
+ rtw_write8(padapter, REG_CR + 1, v8);
/* Disable Hw protection for a time which revserd for Hw sending beacon. */
/* Fix download reserved page packet fail that access collision with the protection time. */
@@ -638,7 +638,7 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)
bRecover = true;
/* To tell Hw the packet is not a real beacon frame. */
- rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, pHalData->RegFwHwTxQCtrl & ~BIT(6));
+ rtw_write8(padapter, REG_FWHW_TXQ_CTRL + 2, pHalData->RegFwHwTxQCtrl & ~BIT(6));
pHalData->RegFwHwTxQCtrl &= ~BIT(6);
/* Clear beacon valid check bit. */
@@ -657,7 +657,7 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)
/* check rsvd page download OK. */
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid));
poll++;
- } while (!bcn_valid && (poll%10) != 0 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
+ } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
} while (!bcn_valid && DLBcnCount <= 100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
@@ -680,14 +680,14 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)
/* the beacon cannot be sent by HW. */
/* 2010.06.23. Added by tynli. */
if (bRecover) {
- rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, pHalData->RegFwHwTxQCtrl | BIT(6));
+ rtw_write8(padapter, REG_FWHW_TXQ_CTRL + 2, pHalData->RegFwHwTxQCtrl | BIT(6));
pHalData->RegFwHwTxQCtrl |= BIT(6);
}
/* Clear CR[8] or beacon packet will not be send to TxBuf anymore. */
- v8 = rtw_read8(padapter, REG_CR+1);
+ v8 = rtw_read8(padapter, REG_CR + 1);
v8 &= ~BIT(0); /* ~ENSWBCN */
- rtw_write8(padapter, REG_CR+1, v8);
+ rtw_write8(padapter, REG_CR + 1, v8);
}
}
@@ -716,7 +716,7 @@ void rtl8723b_Add_RateATid(
u8 raid = arg[1];
u8 shortGI = arg[2];
u8 bw;
- u32 mask = bitmap&0x0FFFFFFF;
+ u32 mask = bitmap & 0x0FFFFFFF;
psta = pmlmeinfo->FW_sta_info[mac_id].psta;
if (!psta)
@@ -805,7 +805,7 @@ static void SetFwRsvdPagePkt_BTCoex(struct adapter *padapter)
PageSize = PAGE_SIZE_TX_8723B;
RsvdPageNum = BCNQ_PAGE_NUM_8723B;
- MaxRsvdPageBufSize = RsvdPageNum*PageSize;
+ MaxRsvdPageBufSize = RsvdPageNum * PageSize;
pcmdframe = rtw_alloc_cmdxmitframe(pxmitpriv);
if (!pcmdframe)
@@ -826,7 +826,7 @@ static void SetFwRsvdPagePkt_BTCoex(struct adapter *padapter)
CurtPktPageNum += 1;
TotalPageNum += CurtPktPageNum;
- BufIndex += (CurtPktPageNum*PageSize);
+ BufIndex += (CurtPktPageNum * PageSize);
/* Jump to lastest page */
if (BufIndex < (MaxRsvdPageBufSize - PageSize)) {
@@ -843,7 +843,7 @@ static void SetFwRsvdPagePkt_BTCoex(struct adapter *padapter)
NULL,
true, 0, 0, false
);
- rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex-TxDescLen], BTQosNullLength, false, true, false);
+ rtl8723b_fill_fake_txdesc(padapter, &ReservedPagePacket[BufIndex - TxDescLen], BTQosNullLength, false, true, false);
CurtPktPageNum = (u8)PageNum_128(TxDescLen + BTQosNullLength);
@@ -885,12 +885,12 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)
/* We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */
/* Suggested by filen. Added by tynli. */
- rtw_write16(padapter, REG_BCN_PSR_RPT, (0xC000|pmlmeinfo->aid));
+ rtw_write16(padapter, REG_BCN_PSR_RPT, (0xC000 | pmlmeinfo->aid));
/* set REG_CR bit 8 */
- val8 = rtw_read8(padapter, REG_CR+1);
+ val8 = rtw_read8(padapter, REG_CR + 1);
val8 |= BIT(0); /* ENSWBCN */
- rtw_write8(padapter, REG_CR+1, val8);
+ rtw_write8(padapter, REG_CR + 1, val8);
/* Disable Hw protection for a time which revserd for Hw sending beacon. */
/* Fix download reserved page packet fail that access collision with the protection time. */
@@ -906,7 +906,7 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)
/* To tell Hw the packet is not a real beacon frame. */
pHalData->RegFwHwTxQCtrl &= ~BIT(6);
- rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, pHalData->RegFwHwTxQCtrl);
+ rtw_write8(padapter, REG_FWHW_TXQ_CTRL + 2, pHalData->RegFwHwTxQCtrl);
/* Clear beacon valid check bit. */
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
@@ -919,11 +919,11 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)
DLBcnCount++;
do {
yield();
-/* mdelay(10); */
+/* mdelay(10); */
/* check rsvd page download OK. */
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, &bcn_valid);
poll++;
- } while (!bcn_valid && (poll%10) != 0 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
+ } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
} while (!bcn_valid && (DLBcnCount <= 100) && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
if (bcn_valid) {
@@ -945,11 +945,11 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)
/* 2010.06.23. Added by tynli. */
if (bRecover) {
pHalData->RegFwHwTxQCtrl |= BIT(6);
- rtw_write8(padapter, REG_FWHW_TXQ_CTRL+2, pHalData->RegFwHwTxQCtrl);
+ rtw_write8(padapter, REG_FWHW_TXQ_CTRL + 2, pHalData->RegFwHwTxQCtrl);
}
/* Clear CR[8] or beacon packet will not be send to TxBuf anymore. */
- val8 = rtw_read8(padapter, REG_CR+1);
+ val8 = rtw_read8(padapter, REG_CR + 1);
val8 &= ~BIT(0); /* ~ENSWBCN */
- rtw_write8(padapter, REG_CR+1, val8);
+ rtw_write8(padapter, REG_CR + 1, val8);
}
--
2.54.0
^ permalink raw reply related
* [PATCH 2/2] staging: rtl8723bs: rename ScanType to scan_type
From: Serhat Kumral @ 2026-06-16 0:01 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, Serhat Kumral
In-Reply-To: <20260616000117.126504-1-serhatkumral1@gmail.com>
Rename the CamelCase field ScanType of struct rt_channel_info, as
well as the relevant local variables, to scan_type to conform to
the Linux kernel coding style guidelines.
This also fixes several checkpatch.pl warnings:
CHECK: Avoid CamelCase: <ScanType>
Signed-off-by: Serhat Kumral <serhatkumral1@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 37 ++++++++++---------
.../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +-
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 0dcac7638..655e1e72b 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -346,18 +346,18 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
(ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_NULL)) {
if (channel_set[chanset_size].channel_num >= 1 &&
channel_set[chanset_size].channel_num <= 11)
- channel_set[chanset_size].ScanType = SCAN_ACTIVE;
+ channel_set[chanset_size].scan_type = SCAN_ACTIVE;
else if (channel_set[chanset_size].channel_num >= 12 &&
channel_set[chanset_size].channel_num <= 14)
- channel_set[chanset_size].ScanType = SCAN_PASSIVE;
+ channel_set[chanset_size].scan_type = SCAN_PASSIVE;
} else if (ChannelPlan == RT_CHANNEL_DOMAIN_WORLD_WIDE_13 ||
Index2G == RT_CHANNEL_DOMAIN_2G_WORLD) { /* channel 12~13, passive scan */
if (channel_set[chanset_size].channel_num <= 11)
- channel_set[chanset_size].ScanType = SCAN_ACTIVE;
+ channel_set[chanset_size].scan_type = SCAN_ACTIVE;
else
- channel_set[chanset_size].ScanType = SCAN_PASSIVE;
+ channel_set[chanset_size].scan_type = SCAN_PASSIVE;
} else
- channel_set[chanset_size].ScanType = SCAN_ACTIVE;
+ channel_set[chanset_size].scan_type = SCAN_ACTIVE;
chanset_size++;
}
@@ -3689,7 +3689,7 @@ unsigned int send_beacon(struct adapter *padapter)
void site_survey(struct adapter *padapter)
{
unsigned char survey_channel = 0, val8;
- enum rt_scan_type ScanType = SCAN_PASSIVE;
+ enum rt_scan_type scan_type = SCAN_PASSIVE;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
u32 initialgain = 0;
@@ -3701,7 +3701,8 @@ void site_survey(struct adapter *padapter)
if (pmlmeext->sitesurvey_res.channel_idx < pmlmeext->sitesurvey_res.ch_num) {
ch = &pmlmeext->sitesurvey_res.ch[pmlmeext->sitesurvey_res.channel_idx];
survey_channel = ch->hw_value;
- ScanType = (ch->flags & RTW_IEEE80211_CHAN_PASSIVE_SCAN) ? SCAN_PASSIVE : SCAN_ACTIVE;
+ scan_type = (ch->flags & RTW_IEEE80211_CHAN_PASSIVE_SCAN) ?
+ SCAN_PASSIVE : SCAN_ACTIVE;
}
}
@@ -3712,7 +3713,7 @@ void site_survey(struct adapter *padapter)
else
r8723bs_select_channel(padapter, survey_channel);
- if (ScanType == SCAN_ACTIVE) { /* obey the channel plan setting... */
+ if (scan_type == SCAN_ACTIVE) { /* obey the channel plan setting... */
{
int i;
@@ -4185,18 +4186,18 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
if (chplan_sta[i].channel_num == chplan_ap.Channel[j]) {
chplan_new[k].channel_num = chplan_ap.Channel[j];
- chplan_new[k].ScanType = SCAN_ACTIVE;
+ chplan_new[k].scan_type = SCAN_ACTIVE;
i++;
j++;
k++;
} else if (chplan_sta[i].channel_num < chplan_ap.Channel[j]) {
chplan_new[k].channel_num = chplan_sta[i].channel_num;
- chplan_new[k].ScanType = SCAN_PASSIVE;
+ chplan_new[k].scan_type = SCAN_PASSIVE;
i++;
k++;
} else if (chplan_sta[i].channel_num > chplan_ap.Channel[j]) {
chplan_new[k].channel_num = chplan_ap.Channel[j];
- chplan_new[k].ScanType = SCAN_ACTIVE;
+ chplan_new[k].scan_type = SCAN_ACTIVE;
j++;
k++;
}
@@ -4207,7 +4208,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
(chplan_sta[i].channel_num != 0) &&
(chplan_sta[i].channel_num <= 14)) {
chplan_new[k].channel_num = chplan_sta[i].channel_num;
- chplan_new[k].ScanType = SCAN_PASSIVE;
+ chplan_new[k].scan_type = SCAN_PASSIVE;
i++;
k++;
}
@@ -4215,7 +4216,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
/* add channel AP supported */
while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] <= 14)) {
chplan_new[k].channel_num = chplan_ap.Channel[j];
- chplan_new[k].ScanType = SCAN_ACTIVE;
+ chplan_new[k].scan_type = SCAN_ACTIVE;
j++;
k++;
}
@@ -4225,7 +4226,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
(chplan_sta[i].channel_num != 0) &&
(chplan_sta[i].channel_num <= 14)) {
chplan_new[k].channel_num = chplan_sta[i].channel_num;
- chplan_new[k].ScanType = chplan_sta[i].ScanType;
+ chplan_new[k].scan_type = chplan_sta[i].scan_type;
i++;
k++;
}
@@ -4244,8 +4245,8 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
i = 0;
while ((i < MAX_CHANNEL_NUM) && (chplan_new[i].channel_num != 0)) {
if (chplan_new[i].channel_num == channel) {
- if (chplan_new[i].ScanType == SCAN_PASSIVE)
- chplan_new[i].ScanType = SCAN_ACTIVE;
+ if (chplan_new[i].scan_type == SCAN_PASSIVE)
+ chplan_new[i].scan_type = SCAN_ACTIVE;
break;
}
i++;
@@ -5315,7 +5316,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c
memcpy(&out[j], &in[i], sizeof(struct rtw_ieee80211_channel));
- if (pmlmeext->channel_set[set_idx].ScanType == SCAN_PASSIVE)
+ if (pmlmeext->channel_set[set_idx].scan_type == SCAN_PASSIVE)
out[j].flags |= RTW_IEEE80211_CHAN_PASSIVE_SCAN;
j++;
@@ -5337,7 +5338,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c
out[j].hw_value = pmlmeext->channel_set[i].channel_num;
- if (pmlmeext->channel_set[i].ScanType == SCAN_PASSIVE)
+ if (pmlmeext->channel_set[i].scan_type == SCAN_PASSIVE)
out[j].flags |= RTW_IEEE80211_CHAN_PASSIVE_SCAN;
j++;
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index a2e0596ae..786dc8055 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -323,7 +323,7 @@ struct mlme_ext_info {
/* The channel information about this channel including joining, scanning, and power constraints. */
struct rt_channel_info {
u8 channel_num; /* The channel number. */
- enum rt_scan_type ScanType; /* Scan type such as passive or active scan. */
+ enum rt_scan_type scan_type; /* Scan type such as passive or active scan. */
};
int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch);
diff --git a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
index ff2072eb3..d201a18d7 100644
--- a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
+++ b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
@@ -74,7 +74,7 @@ static void _rtw_reg_apply_flags(struct wiphy *wiphy)
freq = rtw_ieee80211_channel_to_frequency(channel);
ch = ieee80211_get_channel(wiphy, freq);
if (ch) {
- if (channel_set[i].ScanType == SCAN_PASSIVE)
+ if (channel_set[i].scan_type == SCAN_PASSIVE)
ch->flags = IEEE80211_CHAN_NO_IR;
else
ch->flags = 0;
--
2.54.0
^ permalink raw reply related
* [PATCH 1/2] staging: rtl8723bs: rename ChannelNum to channel_num
From: Serhat Kumral @ 2026-06-16 0:01 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, Serhat Kumral
Rename the CamelCase field ChannelNum of struct rt_channel_info to
channel_num to conform to the Linux kernel coding style guidelines.
This also fixes several checkpatch.pl warnings:
CHECK: Avoid CamelCase: <ChannelNum>
Signed-off-by: Serhat Kumral <serhatkumral1@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 55 ++++++++++---------
.../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +-
3 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index a86d6f97c..0dcac7638 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -172,12 +172,12 @@ int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch)
{
int i;
- for (i = 0; ch_set[i].ChannelNum != 0; i++) {
- if (ch == ch_set[i].ChannelNum)
+ for (i = 0; ch_set[i].channel_num != 0; i++) {
+ if (ch == ch_set[i].channel_num)
break;
}
- if (i >= ch_set[i].ChannelNum)
+ if (i >= ch_set[i].channel_num)
return -1;
return i;
}
@@ -262,7 +262,7 @@ static int has_channel(struct rt_channel_info *channel_set,
int i;
for (i = 0; i < chanset_size; i++)
- if (channel_set[i].ChannelNum == chan)
+ if (channel_set[i].channel_num == chan)
return 1;
return 0;
@@ -339,17 +339,20 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
if (b2_4GBand) {
for (index = 0; index < RTW_ChannelPlan2G[Index2G].Len; index++) {
- channel_set[chanset_size].ChannelNum = RTW_ChannelPlan2G[Index2G].Channel[index];
+ channel_set[chanset_size].channel_num =
+ RTW_ChannelPlan2G[Index2G].Channel[index];
if ((ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN) ||/* Channel 1~11 is active, and 12~14 is passive */
(ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_NULL)) {
- if (channel_set[chanset_size].ChannelNum >= 1 && channel_set[chanset_size].ChannelNum <= 11)
+ if (channel_set[chanset_size].channel_num >= 1 &&
+ channel_set[chanset_size].channel_num <= 11)
channel_set[chanset_size].ScanType = SCAN_ACTIVE;
- else if ((channel_set[chanset_size].ChannelNum >= 12 && channel_set[chanset_size].ChannelNum <= 14))
+ else if (channel_set[chanset_size].channel_num >= 12 &&
+ channel_set[chanset_size].channel_num <= 14)
channel_set[chanset_size].ScanType = SCAN_PASSIVE;
} else if (ChannelPlan == RT_CHANNEL_DOMAIN_WORLD_WIDE_13 ||
Index2G == RT_CHANNEL_DOMAIN_2G_WORLD) { /* channel 12~13, passive scan */
- if (channel_set[chanset_size].ChannelNum <= 11)
+ if (channel_set[chanset_size].channel_num <= 11)
channel_set[chanset_size].ScanType = SCAN_ACTIVE;
else
channel_set[chanset_size].ScanType = SCAN_PASSIVE;
@@ -4173,26 +4176,26 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
if (pregistrypriv->wireless_mode & WIRELESS_11G) {
do {
if ((i == MAX_CHANNEL_NUM) ||
- (chplan_sta[i].ChannelNum == 0) ||
- (chplan_sta[i].ChannelNum > 14))
+ (chplan_sta[i].channel_num == 0) ||
+ (chplan_sta[i].channel_num > 14))
break;
if ((j == chplan_ap.Len) || (chplan_ap.Channel[j] > 14))
break;
- if (chplan_sta[i].ChannelNum == chplan_ap.Channel[j]) {
- chplan_new[k].ChannelNum = chplan_ap.Channel[j];
+ if (chplan_sta[i].channel_num == chplan_ap.Channel[j]) {
+ chplan_new[k].channel_num = chplan_ap.Channel[j];
chplan_new[k].ScanType = SCAN_ACTIVE;
i++;
j++;
k++;
- } else if (chplan_sta[i].ChannelNum < chplan_ap.Channel[j]) {
- chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
+ } else if (chplan_sta[i].channel_num < chplan_ap.Channel[j]) {
+ chplan_new[k].channel_num = chplan_sta[i].channel_num;
chplan_new[k].ScanType = SCAN_PASSIVE;
i++;
k++;
- } else if (chplan_sta[i].ChannelNum > chplan_ap.Channel[j]) {
- chplan_new[k].ChannelNum = chplan_ap.Channel[j];
+ } else if (chplan_sta[i].channel_num > chplan_ap.Channel[j]) {
+ chplan_new[k].channel_num = chplan_ap.Channel[j];
chplan_new[k].ScanType = SCAN_ACTIVE;
j++;
k++;
@@ -4201,9 +4204,9 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
/* change AP not support channel to Passive scan */
while ((i < MAX_CHANNEL_NUM) &&
- (chplan_sta[i].ChannelNum != 0) &&
- (chplan_sta[i].ChannelNum <= 14)) {
- chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
+ (chplan_sta[i].channel_num != 0) &&
+ (chplan_sta[i].channel_num <= 14)) {
+ chplan_new[k].channel_num = chplan_sta[i].channel_num;
chplan_new[k].ScanType = SCAN_PASSIVE;
i++;
k++;
@@ -4211,7 +4214,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
/* add channel AP supported */
while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] <= 14)) {
- chplan_new[k].ChannelNum = chplan_ap.Channel[j];
+ chplan_new[k].channel_num = chplan_ap.Channel[j];
chplan_new[k].ScanType = SCAN_ACTIVE;
j++;
k++;
@@ -4219,9 +4222,9 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
} else {
/* keep original STA 2.4G channel plan */
while ((i < MAX_CHANNEL_NUM) &&
- (chplan_sta[i].ChannelNum != 0) &&
- (chplan_sta[i].ChannelNum <= 14)) {
- chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
+ (chplan_sta[i].channel_num != 0) &&
+ (chplan_sta[i].channel_num <= 14)) {
+ chplan_new[k].channel_num = chplan_sta[i].channel_num;
chplan_new[k].ScanType = chplan_sta[i].ScanType;
i++;
k++;
@@ -4239,8 +4242,8 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
channel = bssid->configuration.ds_config;
chplan_new = pmlmeext->channel_set;
i = 0;
- while ((i < MAX_CHANNEL_NUM) && (chplan_new[i].ChannelNum != 0)) {
- if (chplan_new[i].ChannelNum == channel) {
+ while ((i < MAX_CHANNEL_NUM) && (chplan_new[i].channel_num != 0)) {
+ if (chplan_new[i].channel_num == channel) {
if (chplan_new[i].ScanType == SCAN_PASSIVE)
chplan_new[i].ScanType = SCAN_ACTIVE;
break;
@@ -5332,7 +5335,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c
break;
}
- out[j].hw_value = pmlmeext->channel_set[i].ChannelNum;
+ out[j].hw_value = pmlmeext->channel_set[i].channel_num;
if (pmlmeext->channel_set[i].ScanType == SCAN_PASSIVE)
out[j].flags |= RTW_IEEE80211_CHAN_PASSIVE_SCAN;
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index cb23c6939..a2e0596ae 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -322,7 +322,7 @@ struct mlme_ext_info {
/* The channel information about this channel including joining, scanning, and power constraints. */
struct rt_channel_info {
- u8 ChannelNum; /* The channel number. */
+ u8 channel_num; /* The channel number. */
enum rt_scan_type ScanType; /* Scan type such as passive or active scan. */
};
diff --git a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
index c48a1e3ba..ff2072eb3 100644
--- a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
+++ b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
@@ -70,7 +70,7 @@ static void _rtw_reg_apply_flags(struct wiphy *wiphy)
/* channels apply by channel plans. */
for (i = 0; i < max_chan_nums; i++) {
- channel = channel_set[i].ChannelNum;
+ channel = channel_set[i].channel_num;
freq = rtw_ieee80211_channel_to_frequency(channel);
ch = ieee80211_get_channel(wiphy, freq);
if (ch) {
--
2.54.0
^ permalink raw reply related
* [PATCH] staging: rtl8723bs: remove unnecessary braces in hal_intf.c
From: Alonso Garrigues @ 2026-06-19 19:10 UTC (permalink / raw)
To: gregkh; +Cc: straube.linux, linux-staging, linux-kernel, Alonso Garrigues
Single statement blocks do not need braces
if and else blocks should have consistent bracing
Signed-off-by: Alonso Garrigues <agarrigues@riseup.net>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 9a3ebad35efc..f990df92b96e 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -170,9 +170,8 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level)
if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
add_ratid(padapter, psta, rssi_level);
- else {
+ else
UpdateHalRAMask8723B(padapter, psta->mac_id, rssi_level);
- }
}
void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 *arg, u8 rssi_level)
@@ -216,9 +215,8 @@ void rtw_hal_dm_watchdog(struct adapter *padapter)
void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter)
{
- if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode) {
+ if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode)
rtl8723b_HalDmWatchDog_in_LPS(padapter); /* this function caller is in interrupt context */
- }
}
void beacon_timing_control(struct adapter *padapter)
--
2.54.0
^ permalink raw reply related
* [PATCH v1 13/13] staging: iio: Initialize spi_device_id arrays using member names
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-19 15:54 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Nuno Sá, Michael Hennerich, David Lechner, Andy Shevchenko,
Greg Kroah-Hartman, linux, linux-iio, linux-staging, linux-kernel
In-Reply-To: <cover.1781883685.git.u.kleine-koenig@baylibre.com>
While being less compact, using named initializers allows to more easily
see which members of the structs are assigned which value without having
to lookup the declaration of the struct. And it's also more robust
against changes to the struct definition.
The mentioned robustness is relevant for a planned change to struct
spi_device_id that replaces .driver_data by an anonymous union.
This patch doesn't modify the compiled arrays, only their representation
in source form benefits. The former was confirmed with x86 and arm64
builds.
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/staging/iio/adc/ad7816.c | 6 +++---
drivers/staging/iio/frequency/ad9834.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c
index 0e32a2295990..30644d2d7c54 100644
--- a/drivers/staging/iio/adc/ad7816.c
+++ b/drivers/staging/iio/adc/ad7816.c
@@ -426,9 +426,9 @@ static const struct of_device_id ad7816_of_match[] = {
MODULE_DEVICE_TABLE(of, ad7816_of_match);
static const struct spi_device_id ad7816_id[] = {
- { "ad7816", ID_AD7816 },
- { "ad7817", ID_AD7817 },
- { "ad7818", ID_AD7818 },
+ { .name = "ad7816", .driver_data = ID_AD7816 },
+ { .name = "ad7817", .driver_data = ID_AD7817 },
+ { .name = "ad7818", .driver_data = ID_AD7818 },
{ }
};
diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
index 4359b358e0e5..f95c5365cd03 100644
--- a/drivers/staging/iio/frequency/ad9834.c
+++ b/drivers/staging/iio/frequency/ad9834.c
@@ -465,10 +465,10 @@ static int ad9834_probe(struct spi_device *spi)
}
static const struct spi_device_id ad9834_id[] = {
- {"ad9833", ID_AD9833},
- {"ad9834", ID_AD9834},
- {"ad9837", ID_AD9837},
- {"ad9838", ID_AD9838},
+ { .name = "ad9833", .driver_data = ID_AD9833 },
+ { .name = "ad9834", .driver_data = ID_AD9834 },
+ { .name = "ad9837", .driver_data = ID_AD9837 },
+ { .name = "ad9838", .driver_data = ID_AD9838 },
{ }
};
MODULE_DEVICE_TABLE(spi, ad9834_id);
--
2.47.3
^ permalink raw reply related
* [PATCH v1 12/13] staging: iio: Drop unused assignment of spi_device_id driver data
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-19 15:54 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Nuno Sá, Michael Hennerich, David Lechner, Andy Shevchenko,
Greg Kroah-Hartman, linux, linux-iio, linux-staging, linux-kernel
In-Reply-To: <cover.1781883685.git.u.kleine-koenig@baylibre.com>
The drivers explicitly set the .driver_data member of struct
spi_device_id to zero without relying on that value. Drop these unused
assignments.
While touching these arrays use named initializers for .name.
This patch doesn't modify the compiled arrays, only their representation
in source form benefits. The former was confirmed with x86 and arm64
builds.
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/staging/iio/addac/adt7316-spi.c | 13 ++++++-------
drivers/staging/iio/frequency/ad9832.c | 4 ++--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/iio/addac/adt7316-spi.c b/drivers/staging/iio/addac/adt7316-spi.c
index 1debcc36c1af..459dd7416b1d 100644
--- a/drivers/staging/iio/addac/adt7316-spi.c
+++ b/drivers/staging/iio/addac/adt7316-spi.c
@@ -126,15 +126,14 @@ static int adt7316_spi_probe(struct spi_device *spi_dev)
}
static const struct spi_device_id adt7316_spi_id[] = {
- { "adt7316", 0 },
- { "adt7317", 0 },
- { "adt7318", 0 },
- { "adt7516", 0 },
- { "adt7517", 0 },
- { "adt7519", 0 },
+ { .name = "adt7316" },
+ { .name = "adt7317" },
+ { .name = "adt7318" },
+ { .name = "adt7516" },
+ { .name = "adt7517" },
+ { .name = "adt7519" },
{ }
};
-
MODULE_DEVICE_TABLE(spi, adt7316_spi_id);
static const struct of_device_id adt7316_of_spi_match[] = {
diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
index 659821a1e2cb..1a6666c1948e 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -381,8 +381,8 @@ static const struct of_device_id ad9832_of_match[] = {
MODULE_DEVICE_TABLE(of, ad9832_of_match);
static const struct spi_device_id ad9832_id[] = {
- {"ad9832", 0},
- {"ad9835", 0},
+ { .name = "ad9832" },
+ { .name = "ad9835" },
{ }
};
MODULE_DEVICE_TABLE(spi, ad9832_id);
--
2.47.3
^ permalink raw reply related
* [PATCH v1 00/13] iio: Use named initializers for device_id structures
From: Uwe Kleine-König (The Capable Hub) @ 2026-06-19 15:54 UTC (permalink / raw)
To: Jonathan Cameron
Cc: David Lechner, Nuno Sá, Andy Shevchenko, Vladislav Kulikov,
Kevin Tung, ChiYuan Huang, linux-iio, linux-kernel,
Oleksij Rempel, kernel, Antoniu Miclaus, Michael Hennerich, linux,
Marcelo Schmitt, Petre Rodan, Dan Robertson, Rui Miguel Silva,
Dragos Bogdan, Dixit Parmar, chuguangqing,
Sebastian Andrzej Siewior, Marcus Folkesson, Andrew Davis,
Puranjay Mohan, Ramona Gradinariu, Esteban Blanc,
Sergiu Cuciurean, Alisa-Dariana Roman, Matti Vaittinen,
Renato Lui Geh, Ramona Bolboaca, Kim Seer Paller,
Marilene Andrade Garcia, Marius Cristea, Kent Gustavsson,
Kurt Borja, Leonard Göhrs, Rodrigo Alencar, Gustavo Silva,
Alexis Czezar Torreno, Janani Sunil, Anshul Dalal,
Ricardo Ribalda, Lorenzo Bianconi, Alex Lanzano, Jagath Jog J,
Jean-Baptiste Maneyrol, Remi Buisson, Herve Codina,
Andreas Klinger, Harshit Mogalapalli, Andrew Ijano,
Giorgi Tchankvetadze, Krzysztof Kozlowski, Md Shofiqul Islam,
Greg Kroah-Hartman, Stepan Ionichev, Sam Daly, Colin Ian King,
David Jander, Dmitry Torokhov, Bartosz Golaszewski, Linus Walleij,
Gabriel Rondon, David Marinovic, Lukas Schmid, Shi Hao,
Rahman Mahmutović, linux-staging
Hello,
the first patch is a follow up for making iio's i2c_device_id arrays use
named initializers. The two drivers adapted in it were missed before
because they were not yet in the tree I used to prepare the patch. The
remainder is a similar adaption for spi_device_id. Instead of adapting
arrays with a single entry and .driver_data, rework these to not use
.driver_data.
The ad9523 driver is a bit special here. It can only probe devices that
have platform data. A device instantiated using dt never has platform
data, so this driver only works for boards registering the device using
a spi_board_info struct. There is no such board, and there never was
one. So an alternative is to just drop this driver?!
I was unsure if I should post the staging patches in a separate series,
I hope it's fine to include them here.
Best regards
Uwe
Uwe Kleine-König (The Capable Hub) (13):
iio: Initialize i2c_device_id arrays using member names (part 2)
iio: adc: ti-tsc2046: Simplify device abstraction
iio: adc: ti-tsc2046: Drop unused member from private data
iio: adc: max1241: Simplify device abstraction
iio: dac: max5522: Simplify device abstraction
iio: frequency: ad9523: Simplify driver a bit
iio: imu: adis16550: Simplify device abstraction
iio: magnetometer: hmc5843: Simplify device abstraction
iio: accel: bmc150: Explicitly set spi .driver_data
iio: Drop unused assignment of spi_device_id driver data
iio: Initialize spi_device_id arrays using member names
staging: iio: Drop unused assignment of spi_device_id driver data
staging: iio: Initialize spi_device_id arrays using member names
drivers/iio/accel/adxl345_spi.c | 4 +-
drivers/iio/accel/adxl355_spi.c | 4 +-
drivers/iio/accel/adxl367_spi.c | 2 +-
drivers/iio/accel/adxl372_spi.c | 4 +-
drivers/iio/accel/adxl380_spi.c | 8 +-
drivers/iio/accel/bma220_spi.c | 2 +-
drivers/iio/accel/bma400_spi.c | 2 +-
drivers/iio/accel/bmc150-accel-spi.c | 18 +--
drivers/iio/accel/bmi088-accel-spi.c | 6 +-
drivers/iio/accel/fxls8962af-spi.c | 4 +-
drivers/iio/accel/kxsd9-spi.c | 2 +-
drivers/iio/accel/mma7455_spi.c | 4 +-
drivers/iio/accel/sca3000.c | 8 +-
drivers/iio/accel/sca3300.c | 4 +-
drivers/iio/accel/st_accel_spi.c | 40 +++---
drivers/iio/adc/ad4000.c | 62 ++++-----
drivers/iio/adc/ad4030.c | 14 +-
drivers/iio/adc/ad4080.c | 22 +--
drivers/iio/adc/ad4130.c | 12 +-
drivers/iio/adc/ad4134.c | 2 +-
drivers/iio/adc/ad4170-4.c | 6 +-
drivers/iio/adc/ad4851.c | 18 +--
drivers/iio/adc/ad7091r8.c | 6 +-
drivers/iio/adc/ad7124.c | 4 +-
drivers/iio/adc/ad7173.c | 26 ++--
drivers/iio/adc/ad7191.c | 2 +-
drivers/iio/adc/ad7192.c | 10 +-
drivers/iio/adc/ad7266.c | 4 +-
drivers/iio/adc/ad7280a.c | 2 +-
drivers/iio/adc/ad7292.c | 2 +-
drivers/iio/adc/ad7298.c | 2 +-
drivers/iio/adc/ad7380.c | 36 ++---
drivers/iio/adc/ad7476.c | 60 ++++----
drivers/iio/adc/ad7606_spi.c | 22 +--
drivers/iio/adc/ad7766.c | 12 +-
drivers/iio/adc/ad7768-1.c | 8 +-
drivers/iio/adc/ad7780.c | 8 +-
drivers/iio/adc/ad7791.c | 10 +-
drivers/iio/adc/ad7793.c | 18 +--
drivers/iio/adc/ad7887.c | 2 +-
drivers/iio/adc/ad7923.c | 14 +-
drivers/iio/adc/ad7944.c | 6 +-
drivers/iio/adc/ad7949.c | 6 +-
drivers/iio/adc/ad9467.c | 14 +-
drivers/iio/adc/ade9000.c | 2 +-
drivers/iio/adc/hi8435.c | 2 +-
drivers/iio/adc/max1027.c | 12 +-
drivers/iio/adc/max1118.c | 6 +-
drivers/iio/adc/max11205.c | 4 +-
drivers/iio/adc/max11410.c | 2 +-
drivers/iio/adc/max1241.c | 8 +-
drivers/iio/adc/max14001.c | 4 +-
drivers/iio/adc/mcp320x.c | 26 ++--
drivers/iio/adc/mcp3564.c | 24 ++--
drivers/iio/adc/mcp3911.c | 14 +-
drivers/iio/adc/rohm-bd79112.c | 2 +-
drivers/iio/adc/rtq6056.c | 4 +-
drivers/iio/adc/ti-adc0832.c | 8 +-
drivers/iio/adc/ti-adc084s021.c | 2 +-
drivers/iio/adc/ti-adc108s102.c | 2 +-
drivers/iio/adc/ti-adc12138.c | 6 +-
drivers/iio/adc/ti-adc128s052.c | 24 ++--
drivers/iio/adc/ti-adc161s626.c | 4 +-
drivers/iio/adc/ti-ads1018.c | 4 +-
drivers/iio/adc/ti-ads124s08.c | 4 +-
drivers/iio/adc/ti-ads1298.c | 2 +-
drivers/iio/adc/ti-ads131e08.c | 6 +-
drivers/iio/adc/ti-ads131m02.c | 10 +-
drivers/iio/adc/ti-ads7950.c | 24 ++--
drivers/iio/adc/ti-ads8688.c | 4 +-
drivers/iio/adc/ti-lmp92064.c | 2 +-
drivers/iio/adc/ti-tlc4541.c | 4 +-
drivers/iio/adc/ti-tsc2046.c | 12 +-
drivers/iio/addac/ad74115.c | 2 +-
drivers/iio/amplifiers/ad8366.c | 26 ++--
drivers/iio/amplifiers/ada4250.c | 2 +-
drivers/iio/chemical/bme680_spi.c | 2 +-
drivers/iio/chemical/ens160_spi.c | 2 +-
drivers/iio/dac/ad3530r.c | 8 +-
drivers/iio/dac/ad5064.c | 32 ++---
drivers/iio/dac/ad5360.c | 16 +--
drivers/iio/dac/ad5380.c | 32 ++---
drivers/iio/dac/ad5446-spi.c | 62 ++++-----
drivers/iio/dac/ad5449.c | 14 +-
drivers/iio/dac/ad5504.c | 4 +-
drivers/iio/dac/ad5624r_spi.c | 12 +-
drivers/iio/dac/ad5706r.c | 2 +-
drivers/iio/dac/ad5755.c | 10 +-
drivers/iio/dac/ad5758.c | 2 +-
drivers/iio/dac/ad5761.c | 8 +-
drivers/iio/dac/ad5764.c | 8 +-
drivers/iio/dac/ad5766.c | 4 +-
drivers/iio/dac/ad5770r.c | 2 +-
drivers/iio/dac/ad5791.c | 10 +-
drivers/iio/dac/ad7293.c | 2 +-
drivers/iio/dac/ad7303.c | 2 +-
drivers/iio/dac/ad8801.c | 4 +-
drivers/iio/dac/ad9739a.c | 2 +-
drivers/iio/dac/ltc1660.c | 4 +-
drivers/iio/dac/ltc2632.c | 44 +++---
drivers/iio/dac/ltc2664.c | 4 +-
drivers/iio/dac/ltc2688.c | 2 +-
drivers/iio/dac/max22007.c | 2 +-
drivers/iio/dac/max5522.c | 31 +----
drivers/iio/dac/mcp4821.c | 12 +-
drivers/iio/dac/mcp4922.c | 8 +-
drivers/iio/dac/rohm-bd79703.c | 8 +-
drivers/iio/dac/ti-dac082s085.c | 12 +-
drivers/iio/dac/ti-dac7311.c | 6 +-
drivers/iio/dac/ti-dac7612.c | 2 +-
drivers/iio/filter/admv8818.c | 2 +-
drivers/iio/frequency/ad9523.c | 3 +-
drivers/iio/frequency/adf4350.c | 4 +-
drivers/iio/frequency/adf4371.c | 4 +-
drivers/iio/frequency/adf4377.c | 4 +-
drivers/iio/frequency/admv1013.c | 2 +-
drivers/iio/frequency/admv1014.c | 2 +-
drivers/iio/frequency/adrf6780.c | 2 +-
drivers/iio/gyro/adis16080.c | 4 +-
drivers/iio/gyro/adis16136.c | 8 +-
drivers/iio/gyro/adis16260.c | 12 +-
drivers/iio/gyro/adxrs450.c | 4 +-
drivers/iio/gyro/bmg160_spi.c | 7 +-
drivers/iio/gyro/fxas21002c_spi.c | 2 +-
drivers/iio/gyro/st_gyro_spi.c | 18 +--
drivers/iio/health/afe4403.c | 2 +-
drivers/iio/humidity/hts221_spi.c | 2 +-
drivers/iio/imu/adis16400.c | 30 ++--
drivers/iio/imu/adis16460.c | 2 +-
drivers/iio/imu/adis16475.c | 54 ++++----
drivers/iio/imu/adis16480.c | 40 +++---
drivers/iio/imu/adis16550.c | 9 +-
drivers/iio/imu/bmi160/bmi160_spi.c | 4 +-
drivers/iio/imu/bmi270/bmi270_spi.c | 4 +-
drivers/iio/imu/bmi323/bmi323_spi.c | 2 +-
drivers/iio/imu/fxos8700_spi.c | 2 +-
.../iio/imu/inv_icm42600/inv_icm42600_spi.c | 14 +-
.../iio/imu/inv_icm45600/inv_icm45600_spi.c | 16 +--
drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 34 ++---
drivers/iio/imu/smi240.c | 2 +-
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 48 +++----
drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 4 +-
drivers/iio/light/st_uvis25_spi.c | 2 +-
drivers/iio/magnetometer/bmc150_magn_spi.c | 6 +-
drivers/iio/magnetometer/hmc5843_spi.c | 6 +-
drivers/iio/magnetometer/mmc5983.c | 2 +-
drivers/iio/magnetometer/st_magn_spi.c | 12 +-
drivers/iio/potentiometer/max5481.c | 8 +-
drivers/iio/potentiometer/max5487.c | 6 +-
drivers/iio/potentiometer/mcp41010.c | 12 +-
drivers/iio/potentiometer/mcp4131.c | 128 +++++++++---------
drivers/iio/potentiometer/x9250.c | 4 +-
drivers/iio/pressure/abp2030pa_spi.c | 2 +-
drivers/iio/pressure/bmp280-spi.c | 14 +-
drivers/iio/pressure/hsc030pa_spi.c | 2 +-
drivers/iio/pressure/mpl115_spi.c | 2 +-
drivers/iio/pressure/mprls0025pa_spi.c | 2 +-
drivers/iio/pressure/ms5611_spi.c | 4 +-
drivers/iio/pressure/st_pressure_spi.c | 24 ++--
drivers/iio/pressure/zpa2326_spi.c | 2 +-
drivers/iio/proximity/as3935.c | 2 +-
drivers/iio/resolver/ad2s1200.c | 4 +-
drivers/iio/resolver/ad2s1210.c | 2 +-
drivers/iio/resolver/ad2s90.c | 2 +-
drivers/iio/temperature/ltc2983.c | 10 +-
drivers/iio/temperature/max31856.c | 2 +-
drivers/iio/temperature/max31865.c | 2 +-
drivers/iio/temperature/maxim_thermocouple.c | 18 +--
drivers/staging/iio/adc/ad7816.c | 6 +-
drivers/staging/iio/addac/adt7316-spi.c | 13 +-
drivers/staging/iio/frequency/ad9832.c | 4 +-
drivers/staging/iio/frequency/ad9834.c | 8 +-
172 files changed, 886 insertions(+), 927 deletions(-)
base-commit: 3ce97bd3c4f18608335e709c24d6a40e7036cab8
--
2.47.3
^ permalink raw reply
* [PATCH] staging: rtl8723bs: fix missing unregister_netdev on sdio_alloc_irq failure
From: Devansh Soni @ 2026-06-19 12:57 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, Devansh Soni
In rtw_drv_init(), if rtw_drv_register_netdev() succeeds but
sdio_alloc_irq() fails, the error path jumps to free_if1 and calls
rtw_sdio_if1_deinit(). However, rtw_sdio_if1_deinit() calls
rtw_free_netdev() without a preceding unregister_netdev(), freeing a
still-registered netdev but leaving stale sysfs entries behind.
Signed-off-by: Devansh Soni <devanshsoni874@gmail.com>
---
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index d0feb28b7..6ddc08794 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -359,10 +359,13 @@ static int rtw_drv_init(
status = sdio_alloc_irq(dvobj);
if (status != _SUCCESS)
- goto free_if1;
+ goto free_netdev;
status = _SUCCESS;
+free_netdev:
+ if (status != _SUCCESS)
+ rtw_unregister_netdevs(dvobj);
free_if1:
if (status != _SUCCESS && if1)
rtw_sdio_if1_deinit(if1);
--
2.54.0
^ permalink raw reply related
* [PATCH] staging: media: atomisp: constify pmic_name array
From: Mohammad Abbasi @ 2026-06-19 11:19 UTC (permalink / raw)
To: hansg, mchehab, andy, gregkh
Cc: sakari.ailus, linux-media, linux-kernel, linux-staging,
Mohammad Abbasi, Mohammad Abbasi
Fix the following checkpatch warning:
WARNING: static const char * array should probably be static const char * const
Signed-off-by: Mohammad Abbasi <mohammad.v184@gmail.com>
---
drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
index a1d3a1692..d628fe4dc 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
@@ -109,7 +109,7 @@ static enum {
PMIC_CRYSTALCOVE
} pmic_id;
-static const char *pmic_name[] = {
+static const char * const pmic_name[] = {
[PMIC_UNSET] = "ACPI device PM",
[PMIC_REGULATOR] = "regulator driver",
[PMIC_AXP] = "XPower AXP288 PMIC",
--
2.54.0
^ permalink raw reply related
* [PATCH] staging: rtl8723bs: remove unnecessary braces in rtw_set_oper_ch
From: Alonso Garrigues @ 2026-06-19 10:53 UTC (permalink / raw)
To: gregkh; +Cc: error27, linux-staging, linux-kernel, Alonso Garrigues
Single statement if block does not need braces.
Signed-off-by: Alonso Garrigues <agarrigues@riseup.net>
---
drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index 1d37c2d5b10d..cc05decd4c76 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -256,9 +256,8 @@ inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch)
{
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
- if (dvobj->oper_channel != ch) {
+ if (dvobj->oper_channel != ch)
dvobj->on_oper_ch_time = jiffies;
- }
dvobj->oper_channel = ch;
}
--
2.54.0
^ permalink raw reply related
* Re: [PATCH] staging: rtl8723bs: remove redundant condition in wlanhdr_to_ethhdr
From: Dan Carpenter @ 2026-06-19 10:25 UTC (permalink / raw)
To: Alonso Garrigues; +Cc: gregkh, straube.linux, linux-staging, linux-kernel
In-Reply-To: <20260619101300.1841338-1-agarrigues@riseup.net>
On Fri, Jun 19, 2026 at 11:13:00AM +0100, Alonso Garrigues wrote:
> Comparing boolean return value to true with == is redundant.
> Remove the explicit comparison and the extra parentheses.
>
> Signed-off-by: Alonso Garrigues <agarrigues@riseup.net>
> ---
Someone already did this. Please work against staging-next or
linux-next.
regards,
dan carpenter
^ permalink raw reply
* [PATCH] staging: rtl8723bs: remove redundant condition in wlanhdr_to_ethhdr
From: Alonso Garrigues @ 2026-06-19 10:13 UTC (permalink / raw)
To: gregkh; +Cc: straube.linux, linux-staging, linux-kernel, Alonso Garrigues
Comparing boolean return value to true with == is redundant.
Remove the explicit comparison and the extra parentheses.
Signed-off-by: Alonso Garrigues <agarrigues@riseup.net>
---
drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
index f78194d508df..71dc6dd6473a 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -1597,7 +1597,7 @@ static signed int wlanhdr_to_ethhdr(union recv_frame *precvframe)
eth_type = ntohs(be_tmp); /* pattrib->ether_type */
pattrib->eth_type = eth_type;
- if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)) {
+ if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) {
ptr += rmv_len;
*ptr = 0x87;
*(ptr + 1) = 0x12;
--
2.54.0
^ permalink raw reply related
* [PATCH] staging: rtl8723bs: fix spaces preferred fix
From: Dalvin-Ehinoma Noah Aiguobas @ 2026-06-19 9:39 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel
Adding spaces around operators to match kernel coding style.
Signed-off-by: Dalvin-Ehinoma Noah Aiguobas <fliegbert2@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 196 +++++++++---------
1 file changed, 98 insertions(+), 98 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index a86d6f97cf02..51d4b3627378 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -324,7 +324,7 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
u8 b2_4GBand = false;
u8 Index2G = 0;
- memset(channel_set, 0, sizeof(struct rt_channel_info)*MAX_CHANNEL_NUM);
+ memset(channel_set, 0, sizeof(struct rt_channel_info) * MAX_CHANNEL_NUM);
if (ChannelPlan >= RT_CHANNEL_DOMAIN_MAX && ChannelPlan != RT_CHANNEL_DOMAIN_REALTEK_DEFINE)
return chanset_size;
@@ -588,7 +588,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)
}
/* check the vendor of the assoc AP */
- pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pframe+sizeof(struct ieee80211_hdr_3addr), len-sizeof(struct ieee80211_hdr_3addr));
+ pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pframe + sizeof(struct ieee80211_hdr_3addr), len - sizeof(struct ieee80211_hdr_3addr));
/* update TSF Value */
update_TSF(pmlmeext, pframe, len);
@@ -607,7 +607,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)
return _SUCCESS;
}
- if (((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) {
+ if (((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) {
psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
if (psta) {
ret = rtw_check_bcn_info(padapter, pframe, len);
@@ -625,7 +625,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)
adaptive_early_32k(pmlmeext, pframe, len);
}
- } else if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {
+ } else if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
if (psta) {
/* update WMM, ERP in the beacon */
@@ -674,7 +674,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
uint len = precv_frame->u.hdr.len;
u8 offset = 0;
- if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
+ if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
return _FAIL;
sa = GetAddr2Ptr(pframe);
@@ -688,8 +688,8 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
prxattrib->hdrlen = WLAN_HDR_A3_LEN;
prxattrib->encrypt = _WEP40_;
- iv = pframe+prxattrib->hdrlen;
- prxattrib->key_index = ((iv[3]>>6)&0x3);
+ iv = pframe + prxattrib->hdrlen;
+ prxattrib->key_index = ((iv[3] >> 6) & 0x3);
prxattrib->iv_len = 4;
prxattrib->icv_len = 4;
@@ -930,7 +930,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
u8 *pframe = precv_frame->u.hdr.rx_data;
uint pkt_len = precv_frame->u.hdr.len;
- if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
+ if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
return _FAIL;
frame_type = GetFrameSubType(pframe);
@@ -988,7 +988,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
goto OnAssocReqFail;
} else {
/* check if ssid match */
- if (memcmp(p+2, cur->ssid.ssid, cur->ssid.ssid_length))
+ if (memcmp(p + 2, cur->ssid.ssid, cur->ssid.ssid_length))
status = WLAN_STATUS_CHALLENGE_FAIL;
if (ie_len != cur->ssid.ssid_length)
@@ -1011,7 +1011,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
if (ie_len > sizeof(supportRate))
ie_len = sizeof(supportRate);
- memcpy(supportRate, p+2, ie_len);
+ memcpy(supportRate, p + 2, ie_len);
support_rate_num = ie_len;
p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, WLAN_EID_EXT_SUPP_RATES, &ie_len,
@@ -1046,12 +1046,12 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
wpa_ie = elems.rsn_ie;
wpa_ie_len = elems.rsn_ie_len;
- if (rtw_parse_wpa2_ie(wpa_ie-2, wpa_ie_len+2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) {
+ if (rtw_parse_wpa2_ie(wpa_ie - 2, wpa_ie_len + 2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) {
pstat->dot8021xalg = 1;/* psk, todo:802.1x */
pstat->wpa_psk |= BIT(1);
- pstat->wpa2_group_cipher = group_cipher&psecuritypriv->wpa2_group_cipher;
- pstat->wpa2_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa2_pairwise_cipher;
+ pstat->wpa2_group_cipher = group_cipher & psecuritypriv->wpa2_group_cipher;
+ pstat->wpa2_pairwise_cipher = pairwise_cipher & psecuritypriv->wpa2_pairwise_cipher;
if (!pstat->wpa2_group_cipher)
status = WLAN_STATUS_INVALID_GROUP_CIPHER;
@@ -1068,12 +1068,12 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
wpa_ie = elems.wpa_ie;
wpa_ie_len = elems.wpa_ie_len;
- if (rtw_parse_wpa_ie(wpa_ie-2, wpa_ie_len+2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) {
+ if (rtw_parse_wpa_ie(wpa_ie - 2, wpa_ie_len + 2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) {
pstat->dot8021xalg = 1;/* psk, todo:802.1x */
pstat->wpa_psk |= BIT(0);
- pstat->wpa_group_cipher = group_cipher&psecuritypriv->wpa_group_cipher;
- pstat->wpa_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa_pairwise_cipher;
+ pstat->wpa_group_cipher = group_cipher & psecuritypriv->wpa_group_cipher;
+ pstat->wpa_pairwise_cipher = pairwise_cipher & psecuritypriv->wpa_pairwise_cipher;
if (!pstat->wpa_group_cipher)
status = WLAN_STATUS_INVALID_GROUP_CIPHER;
@@ -1103,7 +1103,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
/* AP support WPA/RSN, and sta is going to do WPS, but AP is not ready */
/* that the selected registrar of AP is _FLASE */
if ((psecuritypriv->wpa_psk > 0)
- && (pstat->flags & (WLAN_STA_WPS|WLAN_STA_MAYBE_WPS))) {
+ && (pstat->flags & (WLAN_STA_WPS | WLAN_STA_MAYBE_WPS))) {
if (pmlmepriv->wps_beacon_ie) {
u8 selected_registrar = 0;
@@ -1134,7 +1134,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
}
if (copy_len > 0)
- memcpy(pstat->wpa_ie, wpa_ie-2, copy_len);
+ memcpy(pstat->wpa_ie, wpa_ie - 2, copy_len);
}
/* check if there is WMM IE & support WWM-PS */
@@ -1153,7 +1153,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
if (!p)
break;
- if (memcmp(p+2, WMM_IE, 6)) {
+ if (memcmp(p + 2, WMM_IE, 6)) {
p = p + ie_len + 2;
continue;
}
@@ -1161,33 +1161,33 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
pstat->flags |= WLAN_STA_WME;
pstat->qos_option = 1;
- pstat->qos_info = *(p+8);
+ pstat->qos_info = *(p + 8);
- pstat->max_sp_len = (pstat->qos_info>>5)&0x3;
+ pstat->max_sp_len = (pstat->qos_info >> 5) & 0x3;
- if ((pstat->qos_info&0xf) != 0xf)
+ if ((pstat->qos_info & 0xf) != 0xf)
pstat->has_legacy_ac = true;
else
pstat->has_legacy_ac = false;
- if (pstat->qos_info&0xf) {
- if (pstat->qos_info&BIT(0))
- pstat->uapsd_vo = BIT(0)|BIT(1);
+ if (pstat->qos_info & 0xf) {
+ if (pstat->qos_info & BIT(0))
+ pstat->uapsd_vo = BIT(0) | BIT(1);
else
pstat->uapsd_vo = 0;
- if (pstat->qos_info&BIT(1))
- pstat->uapsd_vi = BIT(0)|BIT(1);
+ if (pstat->qos_info & BIT(1))
+ pstat->uapsd_vi = BIT(0) | BIT(1);
else
pstat->uapsd_vi = 0;
- if (pstat->qos_info&BIT(2))
- pstat->uapsd_bk = BIT(0)|BIT(1);
+ if (pstat->qos_info & BIT(2))
+ pstat->uapsd_bk = BIT(0) | BIT(1);
else
pstat->uapsd_bk = 0;
- if (pstat->qos_info&BIT(3))
- pstat->uapsd_be = BIT(0)|BIT(1);
+ if (pstat->qos_info & BIT(3))
+ pstat->uapsd_be = BIT(0) | BIT(1);
else
pstat->uapsd_be = 0;
}
@@ -1208,14 +1208,14 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
} else
pstat->flags &= ~WLAN_STA_HT;
- if (!pmlmepriv->htpriv.ht_option && (pstat->flags&WLAN_STA_HT)) {
+ if (!pmlmepriv->htpriv.ht_option && (pstat->flags & WLAN_STA_HT)) {
status = WLAN_STATUS_CHALLENGE_FAIL;
goto OnAssocReqFail;
}
if ((pstat->flags & WLAN_STA_HT) &&
- ((pstat->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) ||
- (pstat->wpa_pairwise_cipher&WPA_CIPHER_TKIP))) {
+ ((pstat->wpa2_pairwise_cipher & WPA_CIPHER_TKIP) ||
+ (pstat->wpa_pairwise_cipher & WPA_CIPHER_TKIP))) {
/* status = WLAN_STATUS_CIPHER_SUITE_REJECTED; */
/* goto OnAssocReqFail; */
}
@@ -1587,7 +1587,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra
if (memcmp(myid(&(padapter->eeprompriv)), GetAddr1Ptr(pframe), ETH_ALEN))/* for if1, sta/ap mode */
return _SUCCESS;
- if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
+ if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
if (!(pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS))
return _SUCCESS;
@@ -1667,7 +1667,7 @@ static s32 rtw_action_public_decache(union recv_frame *recv_frame, s32 token)
struct adapter *adapter = recv_frame->u.hdr.adapter;
struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv);
u8 *frame = recv_frame->u.hdr.rx_data;
- u16 seq_ctrl = ((recv_frame->u.hdr.attrib.seq_num&0xffff) << 4) |
+ u16 seq_ctrl = ((recv_frame->u.hdr.attrib.seq_num & 0xffff) << 4) |
(recv_frame->u.hdr.attrib.frag_num & 0xf);
if (GetRetry(frame)) {
@@ -1803,9 +1803,9 @@ unsigned int OnAction_sa_query(struct adapter *padapter, union recv_frame *precv
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
unsigned short tid;
- switch (pframe[WLAN_HDR_A3_LEN+1]) {
+ switch (pframe[WLAN_HDR_A3_LEN + 1]) {
case 0: /* SA Query req */
- memcpy(&tid, &pframe[WLAN_HDR_A3_LEN+2], sizeof(unsigned short));
+ memcpy(&tid, &pframe[WLAN_HDR_A3_LEN + 2], sizeof(unsigned short));
issue_action_SA_Query(padapter, GetAddr2Ptr(pframe), 1, tid);
break;
@@ -2023,10 +2023,10 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)
u8 *next_ie = ssid_ie + 2 + ssid_len_ori;
u32 remain_len = 0;
- remain_len = ies_len - (next_ie-ies);
+ remain_len = ies_len - (next_ie - ies);
ssid_ie[1] = 0;
- memcpy(ssid_ie+2, next_ie, remain_len);
+ memcpy(ssid_ie + 2, next_ie, remain_len);
len_diff -= ssid_len_ori;
break;
@@ -2086,16 +2086,16 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
pframe += sizeof(struct ieee80211_hdr_3addr);
pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);
- if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
{
int len_diff;
memcpy(pframe, cur_network->ies, cur_network->ie_length);
- len_diff = update_hidden_ssid(pframe+_BEACON_IE_OFFSET_,
- cur_network->ie_length-_BEACON_IE_OFFSET_,
+ len_diff = update_hidden_ssid(pframe + _BEACON_IE_OFFSET_,
+ cur_network->ie_length - _BEACON_IE_OFFSET_,
pmlmeinfo->hidden_ssid_mode);
- pframe += (cur_network->ie_length+len_diff);
- pattrib->pktlen += (cur_network->ie_length+len_diff);
+ pframe += (cur_network->ie_length + len_diff);
+ pattrib->pktlen += (cur_network->ie_length + len_diff);
}
{
@@ -2103,8 +2103,8 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
uint wps_ielen;
u8 sr = 0;
- wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr+TXDESC_OFFSET+sizeof(struct ieee80211_hdr_3addr)+_BEACON_IE_OFFSET_,
- pattrib->pktlen-sizeof(struct ieee80211_hdr_3addr)-_BEACON_IE_OFFSET_, NULL, &wps_ielen);
+ wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr + TXDESC_OFFSET + sizeof(struct ieee80211_hdr_3addr) + _BEACON_IE_OFFSET_,
+ pattrib->pktlen - sizeof(struct ieee80211_hdr_3addr) - _BEACON_IE_OFFSET_, NULL, &wps_ielen);
if (wps_ie && wps_ielen > 0)
rtw_get_wps_attr_content(wps_ie, wps_ielen, WPS_ATTR_SELECTED_REGISTRAR, (u8 *)(&sr), NULL);
if (sr != 0)
@@ -2236,8 +2236,8 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
if (cur_network->ie_length > MAX_IE_SZ)
return;
- if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
- pwps_ie = rtw_get_wps_ie(cur_network->ies+_FIXED_IE_LENGTH_, cur_network->ie_length-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
+ pwps_ie = rtw_get_wps_ie(cur_network->ies + _FIXED_IE_LENGTH_, cur_network->ie_length - _FIXED_IE_LENGTH_, NULL, &wps_ielen);
/* inerset & update wps_probe_resp_ie */
if (pmlmepriv->wps_probe_resp_ie && pwps_ie && wps_ielen > 0) {
@@ -2255,13 +2255,13 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
pattrib->pktlen += wps_offset;
wps_ielen = (uint)pmlmepriv->wps_probe_resp_ie[1];/* to get ie data len */
- if ((wps_offset+wps_ielen+2) <= MAX_IE_SZ) {
- memcpy(pframe, pmlmepriv->wps_probe_resp_ie, wps_ielen+2);
- pframe += wps_ielen+2;
- pattrib->pktlen += wps_ielen+2;
+ if ((wps_offset + wps_ielen + 2) <= MAX_IE_SZ) {
+ memcpy(pframe, pmlmepriv->wps_probe_resp_ie, wps_ielen + 2);
+ pframe += wps_ielen + 2;
+ pattrib->pktlen += wps_ielen + 2;
}
- if ((wps_offset+wps_ielen+2+remainder_ielen) <= MAX_IE_SZ) {
+ if ((wps_offset + wps_ielen + 2 + remainder_ielen) <= MAX_IE_SZ) {
memcpy(pframe, premainder_ie, remainder_ielen);
pframe += remainder_ielen;
pattrib->pktlen += remainder_ielen;
@@ -2278,14 +2278,14 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
signed int ssid_ielen;
signed int ssid_ielen_diff;
u8 *buf;
- u8 *ies = pmgntframe->buf_addr+TXDESC_OFFSET+sizeof(struct ieee80211_hdr_3addr);
+ u8 *ies = pmgntframe->buf_addr + TXDESC_OFFSET + sizeof(struct ieee80211_hdr_3addr);
buf = kzalloc(MAX_IE_SZ, GFP_ATOMIC);
if (!buf)
return;
- ssid_ie = rtw_get_ie(ies+_FIXED_IE_LENGTH_, WLAN_EID_SSID, &ssid_ielen,
- (pframe-ies)-_FIXED_IE_LENGTH_);
+ ssid_ie = rtw_get_ie(ies + _FIXED_IE_LENGTH_, WLAN_EID_SSID, &ssid_ielen,
+ (pframe - ies) - _FIXED_IE_LENGTH_);
ssid_ielen_diff = cur_network->ssid.ssid_length - ssid_ielen;
@@ -2293,8 +2293,8 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
uint remainder_ielen;
u8 *remainder_ie;
- remainder_ie = ssid_ie+2;
- remainder_ielen = (pframe-remainder_ie);
+ remainder_ie = ssid_ie + 2;
+ remainder_ielen = (pframe - remainder_ie);
if (remainder_ielen > MAX_IE_SZ) {
netdev_warn(padapter->pnetdev,
@@ -2304,9 +2304,9 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
}
memcpy(buf, remainder_ie, remainder_ielen);
- memcpy(remainder_ie+ssid_ielen_diff, buf, remainder_ielen);
- *(ssid_ie+1) = cur_network->ssid.ssid_length;
- memcpy(ssid_ie+2, cur_network->ssid.ssid, cur_network->ssid.ssid_length);
+ memcpy(remainder_ie + ssid_ielen_diff, buf, remainder_ielen);
+ *(ssid_ie + 1) = cur_network->ssid.ssid_length;
+ memcpy(ssid_ie + 2, cur_network->ssid.ssid, cur_network->ssid.ssid_length);
pframe += ssid_ielen_diff;
pattrib->pktlen += ssid_ielen_diff;
@@ -2344,7 +2344,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
/* DS parameter set */
pframe = rtw_set_ie(pframe, WLAN_EID_DS_PARAMS, 1, (unsigned char *)&(cur_network->configuration.ds_config), &pattrib->pktlen);
- if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
u8 erpinfo = 0;
u32 ATIMWindow;
/* IBSS Parameter Set... */
@@ -2684,7 +2684,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
pframe = rtw_set_ie(pframe, WLAN_EID_SUPP_RATES, pstat->bssratelen, pstat->bssrateset, &(pattrib->pktlen));
} else {
pframe = rtw_set_ie(pframe, WLAN_EID_SUPP_RATES, 8, pstat->bssrateset, &(pattrib->pktlen));
- pframe = rtw_set_ie(pframe, WLAN_EID_EXT_SUPP_RATES, (pstat->bssratelen-8), pstat->bssrateset+8, &(pattrib->pktlen));
+ pframe = rtw_set_ie(pframe, WLAN_EID_EXT_SUPP_RATES, (pstat->bssratelen - 8), pstat->bssrateset + 8, &(pattrib->pktlen));
}
if ((pstat->flags & WLAN_STA_HT) && (pmlmepriv->htpriv.ht_option)) {
@@ -2694,18 +2694,18 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
/* p = hostapd_eid_ht_capabilities_info(hapd, p); */
pbuf = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_HT_CAPABILITY, &ie_len, (pnetwork->ie_length - _BEACON_IE_OFFSET_));
if (pbuf && ie_len > 0) {
- memcpy(pframe, pbuf, ie_len+2);
- pframe += (ie_len+2);
- pattrib->pktlen += (ie_len+2);
+ memcpy(pframe, pbuf, ie_len + 2);
+ pframe += (ie_len + 2);
+ pattrib->pktlen += (ie_len + 2);
}
/* FILL HT ADD INFO IE */
/* p = hostapd_eid_ht_operation(hapd, p); */
pbuf = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_HT_OPERATION, &ie_len, (pnetwork->ie_length - _BEACON_IE_OFFSET_));
if (pbuf && ie_len > 0) {
- memcpy(pframe, pbuf, ie_len+2);
- pframe += (ie_len+2);
- pattrib->pktlen += (ie_len+2);
+ memcpy(pframe, pbuf, ie_len + 2);
+ pframe += (ie_len + 2);
+ pattrib->pktlen += (ie_len + 2);
}
}
@@ -2716,10 +2716,10 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
for (pbuf = ie + _BEACON_IE_OFFSET_; ; pbuf += (ie_len + 2)) {
pbuf = rtw_get_ie(pbuf, WLAN_EID_VENDOR_SPECIFIC, &ie_len, (pnetwork->ie_length - _BEACON_IE_OFFSET_ - (ie_len + 2)));
- if (pbuf && !memcmp(pbuf+2, WMM_PARA_IE, 6)) {
- memcpy(pframe, pbuf, ie_len+2);
- pframe += (ie_len+2);
- pattrib->pktlen += (ie_len+2);
+ if (pbuf && !memcmp(pbuf + 2, WMM_PARA_IE, 6)) {
+ memcpy(pframe, pbuf, ie_len + 2);
+ pframe += (ie_len + 2);
+ pattrib->pktlen += (ie_len + 2);
break;
}
@@ -2953,9 +2953,9 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da,
fctrl = &(pwlanhdr->frame_control);
*(fctrl) = 0;
- if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)
SetFrDs(fctrl);
- else if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)
+ else if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE)
SetToDs(fctrl);
if (power_mode)
@@ -3095,9 +3095,9 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da,
fctrl = &(pwlanhdr->frame_control);
*(fctrl) = 0;
- if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)
SetFrDs(fctrl);
- else if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)
+ else if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE)
SetToDs(fctrl);
qc = (unsigned short *)(pframe + pattrib->hdrlen - 2);
@@ -3624,7 +3624,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
u16 tid;
- if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
+ if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
if (!(pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS))
return _SUCCESS;
@@ -3635,7 +3635,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
if (initiator == 0) {/* recipient */
for (tid = 0; tid < MAXTID; tid++) {
if (psta->recvreorder_ctrl[tid].enable) {
- issue_action_BA(padapter, addr, WLAN_ACTION_DELBA, (((tid << 1) | initiator)&0x1F));
+ issue_action_BA(padapter, addr, WLAN_ACTION_DELBA, (((tid << 1) | initiator) & 0x1F));
psta->recvreorder_ctrl[tid].enable = false;
psta->recvreorder_ctrl[tid].indicate_seq = 0xffff;
}
@@ -3643,7 +3643,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
} else if (initiator == 1) {/* originator */
for (tid = 0; tid < MAXTID; tid++) {
if (psta->htpriv.agg_enable_bitmap & BIT(tid)) {
- issue_action_BA(padapter, addr, WLAN_ACTION_DELBA, (((tid << 1) | initiator)&0x1F));
+ issue_action_BA(padapter, addr, WLAN_ACTION_DELBA, (((tid << 1) | initiator) & 0x1F));
psta->htpriv.agg_enable_bitmap &= ~BIT(tid);
psta->htpriv.candidate_tid_bitmap &= ~BIT(tid);
}
@@ -3668,7 +3668,7 @@ unsigned int send_beacon(struct adapter *padapter)
cond_resched();
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bxmitok));
poll++;
- } while ((poll%10) != 0 && false == bxmitok && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
+ } while ((poll % 10) != 0 && false == bxmitok && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
} while (false == bxmitok && issue < 100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
@@ -3863,7 +3863,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str
p = rtw_get_ie(bssid->ies + ie_offset, WLAN_EID_EXT_SUPP_RATES, &len, bssid->ie_length - ie_offset);
if (p) {
- if (len > (NDIS_802_11_LENGTH_RATES_EX-i))
+ if (len > (NDIS_802_11_LENGTH_RATES_EX - i))
return _FAIL;
memcpy(bssid->supported_rates + i, (p + 2), len);
@@ -3956,7 +3956,7 @@ void start_create_ibss(struct adapter *padapter)
/* update capability */
caps = rtw_get_capability((struct wlan_bssid_ex *)pnetwork);
update_capinfo(padapter, caps);
- if (caps&WLAN_CAPABILITY_IBSS) {/* adhoc master */
+ if (caps & WLAN_CAPABILITY_IBSS) {/* adhoc master */
val8 = 0xcf;
rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));
@@ -4007,7 +4007,7 @@ void start_clnt_join(struct adapter *padapter)
/* update capability */
caps = rtw_get_capability((struct wlan_bssid_ex *)pnetwork);
update_capinfo(padapter, caps);
- if (caps&WLAN_CAPABILITY_ESS) {
+ if (caps & WLAN_CAPABILITY_ESS) {
set_msr(padapter, WIFI_FW_STATION_STATE);
val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) ? 0xcc : 0xcf;
@@ -4031,10 +4031,10 @@ void start_clnt_join(struct adapter *padapter)
beacon_timeout = decide_wait_for_beacon_timeout(pmlmeinfo->bcn_interval);
set_link_timer(pmlmeext, beacon_timeout);
_set_timer(&padapter->mlmepriv.assoc_timer,
- (REAUTH_TO * REAUTH_LIMIT) + (REASSOC_TO*REASSOC_LIMIT) + beacon_timeout);
+ (REAUTH_TO * REAUTH_LIMIT) + (REASSOC_TO * REASSOC_LIMIT) + beacon_timeout);
pmlmeinfo->state = WIFI_FW_AUTH_NULL | WIFI_FW_STATION_STATE;
- } else if (caps&WLAN_CAPABILITY_IBSS) { /* adhoc client */
+ } else if (caps & WLAN_CAPABILITY_IBSS) { /* adhoc client */
set_msr(padapter, WIFI_FW_ADHOC_STATE);
val8 = 0xcf;
@@ -4096,7 +4096,7 @@ unsigned int receive_disconnect(struct adapter *padapter, unsigned char *MacAddr
if (!(!memcmp(MacAddr, get_my_bssid(&pmlmeinfo->network), ETH_ALEN)))
return _SUCCESS;
- if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) {
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) {
if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) {
pmlmeinfo->state = WIFI_FW_NULL_STATE;
report_del_sta_event(padapter, MacAddr, reason);
@@ -4157,7 +4157,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
if (fcn <= 14)
channel = fcn + j; /* 2.4 GHz */
else
- channel = fcn + j*4; /* 5 GHz */
+ channel = fcn + j * 4; /* 5 GHz */
chplan_ap.Channel[i++] = channel;
}
@@ -4548,7 +4548,7 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta)
psta->htpriv.ampdu_enable = pmlmepriv->htpriv.ampdu_enable;
- psta->htpriv.rx_ampdu_min_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para&IEEE80211_HT_CAP_AMPDU_DENSITY)>>2;
+ psta->htpriv.rx_ampdu_min_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & IEEE80211_HT_CAP_AMPDU_DENSITY) >> 2;
if (support_short_GI(padapter, &(pmlmeinfo->HT_caps), CHANNEL_WIDTH_20))
psta->htpriv.sgi_20m = true;
@@ -4653,7 +4653,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
return;
}
- if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE)
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE)
/* update bc/mc sta_info */
update_bmc_sta(padapter);
@@ -4702,7 +4702,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
join_type = 2;
rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type));
- if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) {
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) {
/* correcting TSF */
correct_TSF(padapter, pmlmeext);
@@ -4719,7 +4719,7 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *p
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
u8 join_type;
- if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) { /* adhoc master or sta_count>1 */
/* nothing to do */
@@ -4781,7 +4781,7 @@ void _linked_info_dump(struct adapter *padapter)
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
if (padapter->bLinkInfoDump) {
- if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)
+ if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE)
rtw_hal_get_def_var(padapter,
HAL_DEF_UNDERCORATEDSMOOTHEDPWDB,
&UndecoratedSmoothedPWDB);
@@ -5271,9 +5271,9 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf)
u8 val8;
if (is_client_associated_to_ap(padapter))
- issue_deauth_ex(padapter, pnetwork->mac_address, WLAN_REASON_DEAUTH_LEAVING, param->deauth_timeout_ms/100, 100);
+ issue_deauth_ex(padapter, pnetwork->mac_address, WLAN_REASON_DEAUTH_LEAVING, param->deauth_timeout_ms / 100, 100);
- if (((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) {
+ if (((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)) {
/* Stop BCN */
val8 = 0;
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_FUNC, (u8 *)(&val8));
@@ -5294,7 +5294,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
/* clear first */
- memset(out, 0, sizeof(struct rtw_ieee80211_channel)*out_num);
+ memset(out, 0, sizeof(struct rtw_ieee80211_channel) * out_num);
/* acquire channels from in */
j = 0;
@@ -5533,7 +5533,7 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS;
if (((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && (pmlmeinfo->HT_enable)) ||
- ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) {
+ ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)) {
/* pmlmeinfo->ADDBA_retry_count = 0; */
/* pmlmeinfo->candidate_tid_bitmap |= (0x1 << pparm->tid); */
/* psta->htpriv.candidate_tid_bitmap |= BIT(pparm->tid); */
--
2.54.0
^ permalink raw reply related
* [PATCH] staging: sm750fb: rename pvReg to mmio
From: Jad Keskes @ 2026-06-19 9:13 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, linux-kernel, Jad Keskes
Rename the Hungarian-notation pvReg field to mmio, which describes
what it is (memory-mapped I/O) rather than what type it is (pointer
to void).
This is a purely mechanical change with no functional difference.
Signed-off-by: Jad Keskes <inasj268@gmail.com>
---
drivers/staging/sm750fb/sm750.c | 4 ++--
drivers/staging/sm750fb/sm750.h | 2 +-
drivers/staging/sm750fb/sm750_hw.c | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 89c811e0806c..2d6b4bdbbdd8 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -743,7 +743,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
* must be set after crtc member initialized
*/
crtc->cursor.offset = crtc->o_screen + crtc->vidmem_size - 1024;
- crtc->cursor.mmio = sm750_dev->pvReg +
+ crtc->cursor.mmio = sm750_dev->mmio +
0x800f0 + (int)crtc->channel * 0x140;
crtc->cursor.max_h = 64;
@@ -1047,7 +1047,7 @@ static void lynxfb_pci_remove(struct pci_dev *pdev)
sm750fb_framebuffer_release(sm750_dev);
arch_phys_wc_del(sm750_dev->mtrr.vram);
- iounmap(sm750_dev->pvReg);
+ iounmap(sm750_dev->mmio);
iounmap(sm750_dev->vmem);
pci_release_region(pdev, 1);
kfree(g_settings);
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index d2c522e67f26..f4dbe161bc56 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -97,7 +97,7 @@ struct sm750_dev {
unsigned long vidreg_start;
__u32 vidmem_size;
__u32 vidreg_size;
- void __iomem *pvReg;
+ void __iomem *mmio;
unsigned char __iomem *vmem;
/* locks*/
spinlock_t slock;
diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c
index 34a837fb4b64..bebbd50db7ac 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -23,18 +23,18 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
}
/* now map mmio and vidmem */
- sm750_dev->pvReg =
+ sm750_dev->mmio =
ioremap(sm750_dev->vidreg_start, sm750_dev->vidreg_size);
- if (!sm750_dev->pvReg) {
+ if (!sm750_dev->mmio) {
dev_err(&pdev->dev, "mmio failed\n");
ret = -EFAULT;
goto err_release_region;
}
- sm750_dev->accel.dpr_base = sm750_dev->pvReg + DE_BASE_ADDR_TYPE1;
- sm750_dev->accel.dp_port_base = sm750_dev->pvReg + DE_PORT_ADDR_TYPE1;
+ sm750_dev->accel.dpr_base = sm750_dev->mmio + DE_BASE_ADDR_TYPE1;
+ sm750_dev->accel.dp_port_base = sm750_dev->mmio + DE_PORT_ADDR_TYPE1;
- mmio750 = sm750_dev->pvReg;
+ mmio750 = sm750_dev->mmio;
sm750_set_chip_type(sm750_dev->devid, sm750_dev->revid);
sm750_dev->vidmem_start = pci_resource_start(pdev, 0);
@@ -58,7 +58,7 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
return 0;
err_unmap_reg:
- iounmap(sm750_dev->pvReg);
+ iounmap(sm750_dev->mmio);
err_release_region:
pci_release_region(pdev, 1);
return ret;
--
2.54.0
^ permalink raw reply related
* [PATCH 3/3] staging: rtl8723bs: remove unused RF_PATH_MAX_90_8812 define
From: Jad Keskes @ 2026-06-19 8:37 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, linux-kernel, Jad Keskes
In-Reply-To: <20260619083736.577096-1-inasj268@gmail.com>
Remove RF_PATH_MAX_90_8812 which is a leftover from RTL8812
chip support and is not referenced anywhere in this driver.
Signed-off-by: Jad Keskes <inasj268@gmail.com>
---
drivers/staging/rtl8723bs/include/hal_phy.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/rtl8723bs/include/hal_phy.h b/drivers/staging/rtl8723bs/include/hal_phy.h
index abc0f27fdaa4..f7dfed0614d7 100644
--- a/drivers/staging/rtl8723bs/include/hal_phy.h
+++ b/drivers/staging/rtl8723bs/include/hal_phy.h
@@ -39,7 +39,6 @@ enum rf_path {
#define TX_4S 3
#define RF_PATH_MAX_92C_88E 2
-#define RF_PATH_MAX_90_8812 4 /* Max RF number 90 support */
enum wireless_mode {
WIRELESS_MODE_UNKNOWN = 0x00,
--
2.54.0
^ permalink raw reply related
* [PATCH 2/3] staging: rtl8723bs: remove unused AMPDU burst mode values
From: Jad Keskes @ 2026-06-19 8:37 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, linux-kernel, Jad Keskes
In-Reply-To: <20260619083736.577096-1-inasj268@gmail.com>
Remove enum values from rt_ampdu_burst that correspond to chips not
supported by this driver:
- RT_AMPDU_BURST_92D
- RT_AMPDU_BURST_88E
- RT_AMPDU_BURST_8812_4/8/12/15
These are leftovers from the original Realtek multi-chip codebase.
Only RT_AMPDU_BURST_NONE and RT_AMPDU_BURST_8723B are kept.
While here, remove the stale comment referencing 92C.
Signed-off-by: Jad Keskes <inasj268@gmail.com>
---
drivers/staging/rtl8723bs/include/hal_data.h | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8723bs/include/hal_data.h b/drivers/staging/rtl8723bs/include/hal_data.h
index 3a93ac312ded..6389e616c951 100644
--- a/drivers/staging/rtl8723bs/include/hal_data.h
+++ b/drivers/staging/rtl8723bs/include/hal_data.h
@@ -37,13 +37,7 @@ enum rt_regulator_mode {
enum rt_ampdu_burst {
RT_AMPDU_BURST_NONE = 0,
- RT_AMPDU_BURST_92D = 1,
- RT_AMPDU_BURST_88E = 2,
- RT_AMPDU_BURST_8812_4 = 3,
- RT_AMPDU_BURST_8812_8 = 4,
- RT_AMPDU_BURST_8812_12 = 5,
- RT_AMPDU_BURST_8812_15 = 6,
- RT_AMPDU_BURST_8723B = 7,
+ RT_AMPDU_BURST_8723B = 1,
};
#define CHANNEL_MAX_NUMBER (14) /* 14 is the max channel number */
@@ -362,7 +356,7 @@ struct hal_com_data {
u8 RegIQKFWOffload;
struct submit_ctx iqk_sctx;
- enum rt_ampdu_burst AMPDUBurstMode; /* 92C maybe not use, but for compile successfully */
+ enum rt_ampdu_burst AMPDUBurstMode;
u32 sdio_himr;
u32 sdio_hisr;
--
2.54.0
^ permalink raw reply related
* [PATCH 1/3] staging: rtl8723bs: remove unused rtl8192c function declarations
From: Jad Keskes @ 2026-06-19 8:37 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, linux-kernel, Jad Keskes
Remove two function declarations from rtl8192c_recv.h that have no
implementation and are never called in the rtl8723bs driver:
- rtl8192c_translate_rx_signal_stuff()
- rtl8192c_query_rx_desc_status()
These are leftovers from the original Realtek multi-chip codebase
and relate to the RTL8192C family, not the RTL8723B.
Signed-off-by: Jad Keskes <inasj268@gmail.com>
---
drivers/staging/rtl8723bs/include/rtl8192c_recv.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/rtl8723bs/include/rtl8192c_recv.h b/drivers/staging/rtl8723bs/include/rtl8192c_recv.h
index 1f86654f0403..b63625ab4e45 100644
--- a/drivers/staging/rtl8723bs/include/rtl8192c_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtl8192c_recv.h
@@ -30,7 +30,4 @@ struct phy_stat {
/* Rx smooth factor */
#define Rx_Smooth_Factor (20)
-void rtl8192c_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_status);
-void rtl8192c_query_rx_desc_status(union recv_frame *precvframe, struct recv_stat *pdesc);
-
#endif
--
2.54.0
^ permalink raw reply related
* Re: [PATCH] staging: rtl8723bs: fix coding style issues in rtl8723b_cmd.c
From: Dan Carpenter @ 2026-06-19 8:06 UTC (permalink / raw)
To: Kai Cheng Jin; +Cc: gregkh, linux-staging, linux-kernel
In-Reply-To: <20260619002543.992270-1-kj@kylejin.com>
On Thu, Jun 18, 2026 at 05:25:43PM -0700, Kai Cheng Jin wrote:
> Add missing spaces around arithmetic and bitwise operators,
> remove unnecessary parentheses after address-of operators, and
> clean up extra blank lines, as reported by checkpatch.pl.
>
Split this into a patchset that fixes one type of warning per
patch.
regards,
dan carpenter
^ permalink raw reply
* Re: [PATCH] staging: rtl8723bs: remove redundant kfree check in rtw_xmit.c
From: Dan Carpenter @ 2026-06-19 7:59 UTC (permalink / raw)
To: Andrezinrc; +Cc: Greg Kroah-Hartman, linux-staging, linux-kernel
In-Reply-To: <20260619022938.15691-1-andrem.33333@gmail.com>
On Thu, Jun 18, 2026 at 11:29:38PM -0300, Andrezinrc wrote:
> Remove the redundant null check before calling kfree. ccheckpatch
> reminds us that kfree(NULL) is safe and this check is not required.
>
> Signed-off-by: Andrezinrc <andrem.33333@gmail.com>
> ---
> drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
> index 7bce0343d..92e818705 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
> @@ -1736,10 +1736,9 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
> pxmitframe->pkt = NULL;
> }
>
> - if (pxmitframe->alloc_addr) {
> - kfree(pxmitframe->alloc_addr);
> + kfree(pxmitframe->alloc_addr);
> + if (pxmitframe->alloc_addr)
> goto check_pkt_complete;
> - }
The code was more readable before.
regards,
dan carpenter
^ permalink raw reply
* Re: [PATCH 1/3] staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in rtw_cmd.c
From: Dan Carpenter @ 2026-06-19 7:57 UTC (permalink / raw)
To: Moksh Panicker; +Cc: gregkh, linux-staging, linux-kernel, skhan
In-Reply-To: <20260619022210.143940-2-mokshpanicker.7@gmail.com>
On Fri, Jun 19, 2026 at 02:22:08AM +0000, Moksh Panicker wrote:
> Replace bare use of 'uint' with 'unsigned int' in rtw_joinbss_cmd().
> This fixes the following checkpatch.pl warning:
>
> WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
> Signed-off-by: Moksh Panicker <mokshpanicker.7@gmail.com>
> ---
Someone already did this. Please work against devel-next or linux-next.
regards,
dan carpenter
^ permalink raw reply
* Re: staging: greybus: audio: possible out of bounds read in the topology parser
From: Maoyi Xie @ 2026-06-19 5:35 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Vaibhav Agarwal, Mark Greer, Johan Hovold, Alex Elder,
greybus-dev, linux-staging, linux-kernel
In-Reply-To: <2026061910-supply-jersey-bb24@gregkh>
Thanks Greg, understood, I will keep the device-trust model in mind.
Best,
Maoyi
^ permalink raw reply
* Re: staging: greybus: audio: possible out of bounds read in the topology parser
From: Greg Kroah-Hartman @ 2026-06-19 4:37 UTC (permalink / raw)
To: Maoyi Xie
Cc: Vaibhav Agarwal, Mark Greer, Johan Hovold, Alex Elder,
greybus-dev, linux-staging, linux-kernel
In-Reply-To: <178183657058.3862365.12892304946786698397@maoyixie.com>
On Fri, Jun 19, 2026 at 10:36:10AM +0800, Maoyi Xie wrote:
> Hi all,
>
> I think the Greybus audio topology parser in
> drivers/staging/greybus/audio_topology.c can read past the topology blob
> when a module reports inconsistent counts.
The kernel trusts the hardware, and the drivers have never been reviewed
or audited for if the hardware does not report the correct data. I'm
sure there are lots of code paths that are buggy if the hardware starts
to do odd things. If this is a threat model you worry about, and wish
to address, wonderful, there should be lots of code to change :)
But for now, Linux assumes that the hardware is trustworthy once a
driver is bound to a device.
thanks,
greg k-h
^ permalink raw reply
* staging: greybus: audio: possible out of bounds read in the topology parser
From: Maoyi Xie @ 2026-06-19 2:36 UTC (permalink / raw)
To: Vaibhav Agarwal, Mark Greer
Cc: Johan Hovold, Alex Elder, Greg Kroah-Hartman, greybus-dev,
linux-staging, linux-kernel
Hi all,
I think the Greybus audio topology parser in
drivers/staging/greybus/audio_topology.c can read past the topology blob
when a module reports inconsistent counts. I would appreciate it if you
could take a look.
gb_audio_gb_get_topology() allocates the blob to a device-reported u16 size
and only checks that it is at least sizeof(struct gb_audio_topology).
size = le16_to_cpu(size_resp.size);
if (size < sizeof(*topo))
return -ENODATA;
topo = kzalloc(size, GFP_KERNEL);
After that the parser trusts the interior fields. gb_generate_enum_strings()
walks one C string per item with no end pointer.
items = le32_to_cpu(gbenum->items);
for (i = 0; i < items; i++) {
strings[i] = data;
while (*data != '\0')
data++;
data++;
}
items is a device le32 and there is no guarantee the blob holds that many
NUL terminated strings, so the while loop runs off the end of the
allocation. The same pattern is in gbaudio_tplg_process_header(), which
derives the control, widget and route offsets by adding device le32 block
sizes with no check against the end of the blob, and in the csize cursor
advance in gbaudio_tplg_process_kcontrols() and gbaudio_tplg_create_widget().
The whole blob is device data parsed on the probe path with no privilege
needed. The attacker here is a malicious or faulty Greybus audio module on
the interface.
I reproduced the enum string walk under KASAN on 7.1-rc7. A blob with one
NUL per item stays inside the allocation. A blob with missing terminators
makes KASAN report a slab out of bounds read past the buffer.
I have a partial fix that passes the buffer end into the enum walk and stops
on overrun. A complete fix also needs to bound the header offsets and the
csize advances against the allocation size, so I wanted to ask before
sending a series.
Does this look like a real bug to you? If it does I am happy to send a
proper patch. The parser was added in c8e6336bb3f8 ("greybus: audio: Add
topology parser for GB codec"), which I think is the right Fixes tag.
Thanks,
Maoyi
https://maoyixie.com/
^ permalink raw reply
* [PATCH] staging: rtl8723bs: remove redundant kfree check in rtw_xmit.c
From: Andrezinrc @ 2026-06-19 2:29 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, linux-kernel, Andrezinrc
Remove the redundant null check before calling kfree. ccheckpatch
reminds us that kfree(NULL) is safe and this check is not required.
Signed-off-by: Andrezinrc <andrem.33333@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 7bce0343d..92e818705 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -1736,10 +1736,9 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
pxmitframe->pkt = NULL;
}
- if (pxmitframe->alloc_addr) {
- kfree(pxmitframe->alloc_addr);
+ kfree(pxmitframe->alloc_addr);
+ if (pxmitframe->alloc_addr)
goto check_pkt_complete;
- }
if (pxmitframe->ext_tag == 0)
queue = &pxmitpriv->free_xmit_queue;
--
2.43.0
^ permalink raw reply related
* [PATCH 3/3] staging: rtl8723bs: Replace bare 'uint' with 'unsigned int' in rtw_ap.c
From: Moksh Panicker @ 2026-06-19 2:22 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, skhan, Moksh Panicker
In-Reply-To: <20260619022210.143940-1-mokshpanicker.7@gmail.com>
Replace bare use of 'uint' with 'unsigned int' in multiple functions
in rtw_ap.c. This fixes the following checkpatch.pl warning:
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
Signed-off-by: Moksh Panicker <mokshpanicker.7@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_ap.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 4b4012411..d4aca0c0c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -60,7 +60,7 @@ static void update_BCNTIM(struct adapter *padapter)
/* update TIM IE */
u8 *p, *dst_ie, *premainder_ie = NULL, *pbackup_remainder_ie = NULL;
__le16 tim_bitmap_le;
- uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
+ unsigned int offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
tim_bitmap_le = cpu_to_le16(pstapriv->tim_bitmap);
@@ -156,7 +156,7 @@ static void update_BCNTIM(struct adapter *padapter)
kfree(pbackup_remainder_ie);
}
- offset = (uint)(dst_ie - pie);
+ offset = (unsigned int)(dst_ie - pie);
pnetwork_mlmeext->ie_length = offset + remainder_ielen;
}
@@ -801,7 +801,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
u8 *pHT_info_ie = NULL;
struct sta_info *psta = NULL;
u16 cap, ht_cap = false;
- uint ie_len = 0;
+ unsigned int ie_len = 0;
int group_cipher, pairwise_cipher;
u8 channel, network_type, support_rate[NDIS_802_11_LENGTH_RATES_EX];
int support_rate_num = 0;
@@ -1408,7 +1408,7 @@ static void update_bcn_wps_ie(struct adapter *padapter)
u8 *premainder_ie;
u8 *pbackup_remainder_ie = NULL;
- uint wps_ielen = 0, wps_offset, remainder_ielen;
+ unsigned int wps_ielen = 0, wps_offset, remainder_ielen;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -1428,7 +1428,7 @@ static void update_bcn_wps_ie(struct adapter *padapter)
if (!pwps_ie_src)
return;
- wps_offset = (uint)(pwps_ie - ie);
+ wps_offset = (unsigned int)(pwps_ie - ie);
premainder_ie = pwps_ie + wps_ielen;
@@ -1437,7 +1437,7 @@ static void update_bcn_wps_ie(struct adapter *padapter)
if (remainder_ielen)
pbackup_remainder_ie = kmemdup(premainder_ie, remainder_ielen, GFP_ATOMIC);
- wps_ielen = (uint)pwps_ie_src[1];/* to get ie data len */
+ wps_ielen = (unsigned int)pwps_ie_src[1];/* to get ie data len */
if ((wps_offset + wps_ielen + 2 + remainder_ielen) <= MAX_IE_SZ) {
memcpy(pwps_ie, pwps_ie_src, wps_ielen + 2);
pwps_ie += (wps_ielen + 2);
--
2.34.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox