* [PATCH 3/5] staging: rtl8723bs: fix alignment of continuation lines
2026-06-02 21:04 [PATCH 1/5] staging: rtl8723bs: remove unnecessary parentheses Jules Debbaut
2026-06-02 21:04 ` [PATCH 2/5] staging: rtl8723bs: add braces to else-if arms Jules Debbaut
@ 2026-06-02 21:04 ` Jules Debbaut
2026-06-02 21:04 ` [PATCH 4/5] staging: rtl8723bs: rewrap long comments and remove dead code Jules Debbaut
2026-06-02 21:04 ` [PATCH 5/5] staging: rtl8723bs: fix lines exceeding 100 columns Jules Debbaut
3 siblings, 0 replies; 6+ messages in thread
From: Jules Debbaut @ 2026-06-02 21:04 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, Jules Debbaut
Fix alignment of continuation lines to match the open parenthesis
on the preceding line, as flagged by checkpatch. Collapse the call
to rtw_ieee802_11_parse_vendor_specific() onto a single line where
it fits within the 100-column limit.
Signed-off-by: Jules Debbaut <julesdebbaut@icloud.com>
---
drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index f5a6f6e1c..8ef12222e 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -107,7 +107,7 @@ int rtw_check_network_type(unsigned char *rate, int channel)
}
u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *source,
- unsigned int *frlen)
+ unsigned int *frlen)
{
memcpy(pbuf, source, len);
*frlen = *frlen + len;
@@ -702,7 +702,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_att
*len_attr = 0;
if ((wps_ie[0] != WLAN_EID_VENDOR_SPECIFIC) ||
- (memcmp(wps_ie + 2, wps_oui, 4))) {
+ (memcmp(wps_ie + 2, wps_oui, 4))) {
return attr_ptr;
}
@@ -766,8 +766,8 @@ u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8
}
static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
- struct rtw_ieee802_11_elems *elems,
- int show_errors)
+ struct rtw_ieee802_11_elems *elems,
+ int show_errors)
{
unsigned int oui;
@@ -911,9 +911,7 @@ enum parse_result rtw_ieee802_11_parse_elems(u8 *start, uint len,
elems->ext_supp_rates_len = elen;
break;
case WLAN_EID_VENDOR_SPECIFIC:
- if (rtw_ieee802_11_parse_vendor_specific(pos, elen,
- elems,
- show_errors))
+ if (rtw_ieee802_11_parse_vendor_specific(pos, elen, elems, show_errors))
unknown++;
break;
case WLAN_EID_RSN:
--
2.53.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/5] staging: rtl8723bs: rewrap long comments and remove dead code
2026-06-02 21:04 [PATCH 1/5] staging: rtl8723bs: remove unnecessary parentheses Jules Debbaut
2026-06-02 21:04 ` [PATCH 2/5] staging: rtl8723bs: add braces to else-if arms Jules Debbaut
2026-06-02 21:04 ` [PATCH 3/5] staging: rtl8723bs: fix alignment of continuation lines Jules Debbaut
@ 2026-06-02 21:04 ` Jules Debbaut
2026-06-02 21:04 ` [PATCH 5/5] staging: rtl8723bs: fix lines exceeding 100 columns Jules Debbaut
3 siblings, 0 replies; 6+ messages in thread
From: Jules Debbaut @ 2026-06-02 21:04 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, Jules Debbaut
Rewrap kdoc comment lines that exceed the 100-column limit.
Remove a commented-out call to rtw_set_ie() for
WLAN_EID_EXT_SUPP_RATES that is duplicated by the active
call later in the function.
Signed-off-by: Jules Debbaut <julesdebbaut@icloud.com>
---
drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index 8ef12222e..7cf014e25 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -168,7 +168,8 @@ u8 *rtw_get_ie(u8 *pbuf, signed int index, signed int *len, signed int limit)
* @eid: Element ID to match
* @oui: OUI to match
* @oui_len: OUI length
- * @ie: If not NULL and the specific IE is found, the IE will be copied to the buf starting from the specific IE
+ * @ie: If not NULL and the specific IE is found, the IE will be
+ * copied to the buf starting from the specific IE
* @ielen: If not NULL and the specific IE is found, will set to the length of the entire IE
*
* Returns: The address of the specific IE found, or NULL
@@ -330,7 +331,6 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
if (rate_len > 8) {
ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, 8, pdev_network->supported_rates, &sz);
- /* ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rate_len - 8), (pdev_network->supported_rates + 8), &sz); */
} else {
ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, rate_len, pdev_network->supported_rates, &sz);
}
@@ -687,8 +687,10 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)
* @wps_ie: Address of WPS IE to search
* @wps_ielen: Length limit from wps_ie
* @target_attr_id: The attribute ID of WPS attribute to search
- * @buf_attr: If not NULL and the WPS attribute is found, WPS attribute will be copied to the buf starting from buf_attr
- * @len_attr: If not NULL and the WPS attribute is found, will set to the length of the entire WPS attribute
+ * @buf_attr: If not NULL and the WPS attribute is found, WPS attribute
+ * will be copied to the buf starting from buf_attr
+ * @len_attr: If not NULL and the WPS attribute is found, will set to
+ * the length of the entire WPS attribute
*
* Returns: the address of the specific WPS attribute found, or NULL
*/
@@ -737,8 +739,10 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_att
* @wps_ie: Address of WPS IE to search
* @wps_ielen: Length limit from wps_ie
* @target_attr_id: The attribute ID of WPS attribute to search
- * @buf_content: If not NULL and the WPS attribute is found, WPS attribute content will be copied to the buf starting from buf_content
- * @len_content: If not NULL and the WPS attribute is found, will set to the length of the WPS attribute content
+ * @buf_content: If not NULL and the WPS attribute is found, WPS
+ * attribute content will be copied to the buf starting from buf_content
+ * @len_content: If not NULL and the WPS attribute is found, will set
+ * to the length of the WPS attribute content
*
* Returns: the address of the specific WPS attribute content found, or NULL
*/
--
2.53.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 5/5] staging: rtl8723bs: fix lines exceeding 100 columns
2026-06-02 21:04 [PATCH 1/5] staging: rtl8723bs: remove unnecessary parentheses Jules Debbaut
` (2 preceding siblings ...)
2026-06-02 21:04 ` [PATCH 4/5] staging: rtl8723bs: rewrap long comments and remove dead code Jules Debbaut
@ 2026-06-02 21:04 ` Jules Debbaut
2026-07-07 11:04 ` Greg Kroah-Hartman
3 siblings, 1 reply; 6+ messages in thread
From: Jules Debbaut @ 2026-06-02 21:04 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, Jules Debbaut
Break long lines to fit within the 100-column limit. Extract
local variables for repeated expressions in rtw_get_bcn_info()
to shorten long rtw_get_ie() calls.
Signed-off-by: Jules Debbaut <julesdebbaut@icloud.com>
---
.../staging/rtl8723bs/core/rtw_ieee80211.c | 42 ++++++++++++-------
1 file changed, 28 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index 7cf014e25..8f08d7e74 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -237,7 +237,8 @@ int rtw_ies_remove_ie(u8 *ies, uint *ies_len, uint offset, u8 eid, u8 *oui, u8 o
search_len = *ies_len - offset;
while (1) {
- target_ie = rtw_get_ie_ex(start, search_len, eid, oui, oui_len, NULL, &target_ielen);
+ target_ie = rtw_get_ie_ex(start, search_len, eid, oui,
+ oui_len, NULL, &target_ielen);
if (target_ie && target_ielen) {
u8 *remain_ies = target_ie + target_ielen;
uint remain_len = search_len - (remain_ies - start);
@@ -274,7 +275,8 @@ void rtw_set_supported_rate(u8 *supported_rates, uint mode)
case WIRELESS_11_24N:
case WIRELESS_11BG_24N:
memcpy(supported_rates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
- memcpy(supported_rates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
+ memcpy(supported_rates + IEEE80211_CCK_RATE_LEN,
+ WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
break;
}
}
@@ -301,7 +303,8 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
ie += sz;
/* beacon interval : 2bytes */
- *(__le16 *)ie = cpu_to_le16((u16)pdev_network->configuration.beacon_period);/* BCN_INTERVAL; */
+ *(__le16 *)ie = cpu_to_le16((u16)pdev_network->configuration.beacon_period);
+ /* BCN_INTERVAL; */
sz += 2;
ie += 2;
@@ -320,7 +323,8 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
ie += 2;
/* SSID */
- ie = rtw_set_ie(ie, WLAN_EID_SSID, pdev_network->ssid.ssid_length, pdev_network->ssid.ssid, &sz);
+ ie = rtw_set_ie(ie, WLAN_EID_SSID, pdev_network->ssid.ssid_length,
+ pdev_network->ssid.ssid, &sz);
/* supported rates */
wireless_mode = pregistrypriv->wireless_mode;
@@ -332,17 +336,21 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
if (rate_len > 8) {
ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, 8, pdev_network->supported_rates, &sz);
} else {
- ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, rate_len, pdev_network->supported_rates, &sz);
+ ie = rtw_set_ie(ie, WLAN_EID_SUPP_RATES, rate_len,
+ pdev_network->supported_rates, &sz);
}
/* DS parameter set */
- ie = rtw_set_ie(ie, WLAN_EID_DS_PARAMS, 1, (u8 *)&pdev_network->configuration.ds_config, &sz);
+ ie = rtw_set_ie(ie, WLAN_EID_DS_PARAMS, 1,
+ (u8 *)&pdev_network->configuration.ds_config, &sz);
/* IBSS Parameter Set */
- ie = rtw_set_ie(ie, WLAN_EID_IBSS_PARAMS, 2, (u8 *)&pdev_network->configuration.atim_window, &sz);
+ ie = rtw_set_ie(ie, WLAN_EID_IBSS_PARAMS, 2,
+ (u8 *)&pdev_network->configuration.atim_window, &sz);
if (rate_len > 8)
- ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rate_len - 8), (pdev_network->supported_rates + 8), &sz);
+ ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rate_len - 8),
+ (pdev_network->supported_rates + 8), &sz);
/* HT Cap. */
if ((pregistrypriv->wireless_mode & WIRELESS_11_24N) &&
@@ -442,7 +450,8 @@ int rtw_get_wpa2_cipher_suite(u8 *s)
return 0;
}
-int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x)
+int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher,
+ int *pairwise_cipher, int *is_8021x)
{
int i, ret = _SUCCESS;
int left, count;
@@ -507,7 +516,8 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis
return ret;
}
-int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x)
+int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher,
+ int *pairwise_cipher, int *is_8021x)
{
int i, ret = _SUCCESS;
int left, count;
@@ -746,7 +756,8 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_att
*
* Returns: the address of the specific WPS attribute content found, or NULL
*/
-u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_content, uint *len_content)
+u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen,
+ u16 target_attr_id, u8 *buf_content, uint *len_content)
{
u8 *attr_ptr;
u32 attr_len;
@@ -1053,6 +1064,8 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
unsigned int len;
unsigned char *p;
__le16 le_cap;
+ u8 *ies = pnetwork->network.ies + _FIXED_IE_LENGTH_;
+ uint ie_len = pnetwork->network.ie_length - _FIXED_IE_LENGTH_;
memcpy((u8 *)&le_cap, rtw_get_capability_from_ie(pnetwork->network.ies), 2);
cap = le16_to_cpu(le_cap);
@@ -1062,7 +1075,8 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
} else {
pnetwork->bcn_info.encryp_protocol = ENCRYP_PROTOCOL_OPENSYS;
}
- rtw_get_sec_ie(pnetwork->network.ies, pnetwork->network.ie_length, NULL, &rsn_len, NULL, &wpa_len);
+ rtw_get_sec_ie(pnetwork->network.ies, pnetwork->network.ie_length,
+ NULL, &rsn_len, NULL, &wpa_len);
if (rsn_len > 0) {
pnetwork->bcn_info.encryp_protocol = ENCRYP_PROTOCOL_WPA2;
@@ -1076,7 +1090,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
/* get bwmode and ch_offset */
/* parsing HT_CAP_IE */
- p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);
+ p = rtw_get_ie(ies, WLAN_EID_HT_CAPABILITY, &len, ie_len);
if (p && len > 0) {
pht_cap = (struct ieee80211_ht_cap *)(p + 2);
pnetwork->bcn_info.ht_cap_info = le16_to_cpu(pht_cap->cap_info);
@@ -1084,7 +1098,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
pnetwork->bcn_info.ht_cap_info = 0;
}
/* parsing HT_INFO_IE */
- p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);
+ p = rtw_get_ie(ies, WLAN_EID_HT_OPERATION, &len, ie_len);
if (p && len > 0) {
pht_info = (struct HT_info_element *)(p + 2);
pnetwork->bcn_info.ht_info_infos_0 = pht_info->infos[0];
--
2.53.0
^ permalink raw reply related [flat|nested] 6+ messages in thread