* [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c
@ 2024-02-01 14:04 Meir Elisha
2024-02-01 14:04 ` [PATCH v2 1/4] Staging: rtl8723bs: Remove unnecessary braces Meir Elisha
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Meir Elisha @ 2024-02-01 14:04 UTC (permalink / raw)
To: Greg Kroah-Hartman, Hans de Goede, Ruan Jinjie, Yang Yingliang
Cc: linux-staging, linux-kernel, Meir Elisha
Checkpatch fix series for rtw_mlme.c
---
Changes in v2:
- Remove dead code
- Fix comment in _rtw_join_timeout_handler()
Meir Elisha (4):
Staging: rtl8723bs: Remove unnecessary braces
Staging: rtl8723bs: Remove extra spaces
Staging: rtl8723bs: Fix block comments warning
Staging: rtl8723bs: fix else after break warning
drivers/staging/rtl8723bs/core/rtw_mlme.c | 227 ++++++++--------------
1 file changed, 81 insertions(+), 146 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/4] Staging: rtl8723bs: Remove unnecessary braces
2024-02-01 14:04 [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c Meir Elisha
@ 2024-02-01 14:04 ` Meir Elisha
2024-02-01 14:04 ` [PATCH v2 2/4] Staging: rtl8723bs: Remove extra spaces Meir Elisha
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Meir Elisha @ 2024-02-01 14:04 UTC (permalink / raw)
To: Greg Kroah-Hartman, Hans de Goede, Ruan Jinjie, Yang Yingliang
Cc: linux-staging, linux-kernel, Meir Elisha
braces {} are not necessary for single statement blocks
Signed-off-by: Meir Elisha <meir6264@Gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index b221913733fb..5568215b35bd 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1548,9 +1548,9 @@ void _rtw_join_timeout_handler(struct timer_list *t)
int do_join_r;
do_join_r = rtw_do_join(adapter);
- if (do_join_r != _SUCCESS) {
+ if (do_join_r != _SUCCESS)
continue;
- }
+
break;
} else {
rtw_indicate_disconnect(adapter);
@@ -2432,9 +2432,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe
return;
/* maybe needs check if ap supports rx ampdu. */
- if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) {
+ if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable == 1)
phtpriv->ampdu_enable = true;
- }
/* check Max Rx A-MPDU Size */
len = 0;
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/4] Staging: rtl8723bs: Remove extra spaces
2024-02-01 14:04 [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c Meir Elisha
2024-02-01 14:04 ` [PATCH v2 1/4] Staging: rtl8723bs: Remove unnecessary braces Meir Elisha
@ 2024-02-01 14:04 ` Meir Elisha
2024-02-02 7:21 ` Dan Carpenter
2024-02-01 14:04 ` [PATCH v2 3/4] Staging: rtl8723bs: Fix block comments warning Meir Elisha
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Meir Elisha @ 2024-02-01 14:04 UTC (permalink / raw)
To: Greg Kroah-Hartman, Hans de Goede, Ruan Jinjie, Yang Yingliang
Cc: linux-staging, linux-kernel, Meir Elisha
Fix checkpatch warning: please, no space before tabs
Signed-off-by: Meir Elisha <meir6264@Gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 63 ++++++++++-------------
1 file changed, 26 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 5568215b35bd..44b77c1ba992 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -169,7 +169,6 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor
{
unsigned int delta_time;
u32 lifetime = SCANQUEUE_LIFETIME;
-/* _irqL irqL; */
struct __queue *free_queue = &(pmlmepriv->free_bss_pool);
if (!pnetwork)
@@ -389,14 +388,10 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea
d_cap = le16_to_cpu(tmpd);
return (src->ssid.ssid_length == dst->ssid.ssid_length) &&
- /* (src->configuration.ds_config == dst->configuration.ds_config) && */
- ((!memcmp(src->mac_address, dst->mac_address, ETH_ALEN))) &&
- ((!memcmp(src->ssid.ssid, dst->ssid.ssid, src->ssid.ssid_length))) &&
- ((s_cap & WLAN_CAPABILITY_IBSS) ==
- (d_cap & WLAN_CAPABILITY_IBSS)) &&
- ((s_cap & WLAN_CAPABILITY_ESS) ==
- (d_cap & WLAN_CAPABILITY_ESS));
-
+ ((!memcmp(src->mac_address, dst->mac_address, ETH_ALEN))) &&
+ ((!memcmp(src->ssid.ssid, dst->ssid.ssid, src->ssid.ssid_length))) &&
+ ((s_cap & WLAN_CAPABILITY_IBSS) == (d_cap & WLAN_CAPABILITY_IBSS)) &&
+ ((s_cap & WLAN_CAPABILITY_ESS) == (d_cap & WLAN_CAPABILITY_ESS));
}
struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue, struct wlan_network *network)
@@ -627,11 +622,11 @@ void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)
}
/* select the desired network based on the capability of the (i)bss. */
-/* check items: (1) security */
-/* (2) network_type */
-/* (3) WMM */
-/* (4) HT */
-/* (5) others */
+/* check items: (1) security */
+/* (2) network_type */
+/* (3) WMM */
+/* (4) HT */
+/* (5) others */
int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork);
int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork)
{
@@ -1054,9 +1049,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48));
}
- /* Commented by Albert 2012/07/21 */
- /* When doing the WPS, the wps_ie_len won't equal to 0 */
- /* And the Wi-Fi driver shouldn't allow the data packet to be transmitted. */
+ /* Commented by Albert 2012/07/21 */
+ /* When doing the WPS, the wps_ie_len won't equal to 0 */
+ /* And the Wi-Fi driver shouldn't allow the data packet to be transmitted. */
if (padapter->securitypriv.wps_ie_len != 0) {
psta->ieee8021x_blocked = true;
padapter->securitypriv.wps_ie_len = 0;
@@ -1916,10 +1911,10 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurity
signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, signed int keyid, u8 set_tx, bool enqueue)
{
u8 keylen;
- struct cmd_obj *pcmd;
- struct setkey_parm *psetkeyparm;
- struct cmd_priv *pcmdpriv = &(adapter->cmdpriv);
- signed int res = _SUCCESS;
+ struct cmd_obj *pcmd;
+ struct setkey_parm *psetkeyparm;
+ struct cmd_priv *pcmdpriv = &(adapter->cmdpriv);
+ signed int res = _SUCCESS;
psetkeyparm = rtw_zmalloc(sizeof(struct setkey_parm));
if (!psetkeyparm) {
@@ -2023,9 +2018,8 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
/* */
/* Search by BSSID, */
/* Return Value: */
-/* -1 :if there is no pre-auth key in the table */
-/* >= 0 :if there is pre-auth key, and return the entry id */
-/* */
+/* -1 :if there is no pre-auth key in the table */
+/* >= 0 :if there is pre-auth key, and return the entry id */
/* */
static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid)
@@ -2186,8 +2180,7 @@ void rtw_joinbss_reset(struct adapter *padapter)
{
u8 threshold;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
-
- struct ht_priv *phtpriv = &pmlmepriv->htpriv;
+ struct ht_priv *phtpriv = &pmlmepriv->htpriv;
/* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */
@@ -2213,11 +2206,11 @@ void rtw_joinbss_reset(struct adapter *padapter)
void rtw_ht_use_default_setting(struct adapter *padapter)
{
- struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
- struct ht_priv *phtpriv = &pmlmepriv->htpriv;
+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+ struct ht_priv *phtpriv = &pmlmepriv->htpriv;
struct registry_priv *pregistrypriv = &padapter->registrypriv;
- bool bHwLDPCSupport = false, bHwSTBCSupport = false;
- bool bHwSupportBeamformer = false, bHwSupportBeamformee = false;
+ bool bHwLDPCSupport = false, bHwSTBCSupport = false;
+ bool bHwSupportBeamformer = false, bHwSupportBeamformee = false;
if (pregistrypriv->wifi_spec)
phtpriv->bss_coexist = 1;
@@ -2288,7 +2281,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
u8 cbw40_enable = 0, stbc_rx_enable = 0, operation_bw = 0;
struct registry_priv *pregistrypriv = &padapter->registrypriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
- struct ht_priv *phtpriv = &pmlmepriv->htpriv;
+ struct ht_priv *phtpriv = &pmlmepriv->htpriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
phtpriv->ht_option = false;
@@ -2413,14 +2406,10 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe
{
u8 *p, max_ampdu_sz;
int len;
- /* struct sta_info *bmc_sta, *psta; */
struct ieee80211_ht_cap *pht_capie;
- /* struct recv_reorder_ctrl *preorder_ctrl; */
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
- struct ht_priv *phtpriv = &pmlmepriv->htpriv;
- /* struct recv_priv *precvpriv = &padapter->recvpriv; */
+ struct ht_priv *phtpriv = &pmlmepriv->htpriv;
struct registry_priv *pregistrypriv = &padapter->registrypriv;
- /* struct wlan_network *pcur_network = &(pmlmepriv->cur_network);; */
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u8 cbw40_enable = 0;
@@ -2546,7 +2535,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *pout_len)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
- struct ht_priv *phtpriv = &pmlmepriv->htpriv;
+ struct ht_priv *phtpriv = &pmlmepriv->htpriv;
u8 cap_content[8] = {0};
if (phtpriv->bss_coexist)
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/4] Staging: rtl8723bs: Fix block comments warning
2024-02-01 14:04 [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c Meir Elisha
2024-02-01 14:04 ` [PATCH v2 1/4] Staging: rtl8723bs: Remove unnecessary braces Meir Elisha
2024-02-01 14:04 ` [PATCH v2 2/4] Staging: rtl8723bs: Remove extra spaces Meir Elisha
@ 2024-02-01 14:04 ` Meir Elisha
2024-02-01 14:04 ` [PATCH v2 4/4] Staging: rtl8723bs: fix else after break warning Meir Elisha
2024-02-01 21:26 ` [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c Philipp Hortmann
4 siblings, 0 replies; 8+ messages in thread
From: Meir Elisha @ 2024-02-01 14:04 UTC (permalink / raw)
To: Greg Kroah-Hartman, Hans de Goede, Ruan Jinjie, Yang Yingliang
Cc: linux-staging, linux-kernel, Meir Elisha
Fix checkpatch warning: Block comments use * on subsequent lines
Signed-off-by: Meir Elisha <meir6264@Gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 121 +++++++---------------
1 file changed, 38 insertions(+), 83 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 44b77c1ba992..13bc0ebca247 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -109,32 +109,6 @@ void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)
}
}
-/*
-struct wlan_network *_rtw_dequeue_network(struct __queue *queue)
-{
- _irqL irqL;
-
- struct wlan_network *pnetwork;
-
- spin_lock_bh(&queue->lock);
-
- if (list_empty(&queue->queue))
-
- pnetwork = NULL;
-
- else
- {
- pnetwork = container_of(get_next(&queue->queue), struct wlan_network, list);
-
- list_del_init(&(pnetwork->list));
- }
-
- spin_unlock_bh(&queue->lock);
-
- return pnetwork;
-}
-*/
-
struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv)
{
struct wlan_network *pnetwork;
@@ -217,10 +191,9 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *
}
/*
- return the wlan_network with the matching addr
-
- Shall be called under atomic context... to avoid possible racing condition...
-*/
+ * return the wlan_network with the matching addr *
+ * Shall be called under atomic context... to avoid possible racing condition...
+ */
struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr)
{
struct list_head *phead, *plist;
@@ -320,15 +293,6 @@ void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)
_rtw_free_mlme_priv(pmlmepriv);
}
-/*
-static struct wlan_network *rtw_dequeue_network(struct __queue *queue)
-{
- struct wlan_network *pnetwork;
-
- pnetwork = _rtw_dequeue_network(queue);
- return pnetwork;
-}
-*/
void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork);
void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork)
@@ -338,10 +302,9 @@ void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnet
}
/*
- return the wlan_network with the matching addr
-
- Shall be called under atomic context... to avoid possible racing condition...
-*/
+ * return the wlan_network with the matching addr
+ * Shall be called under atomic context... to avoid possible racing condition...
+ */
struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)
{
struct wlan_network *pnetwork = _rtw_find_network(scanned_queue, addr);
@@ -501,8 +464,8 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex
}
/*
-Caller must hold pmlmepriv->lock first.
-*/
+ * Caller must hold pmlmepriv->lock first.
+ */
void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target)
{
struct list_head *plist, *phead;
@@ -536,12 +499,11 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
}
/* If we didn't find a match, then get a new network slot to initialize
- * with this beacon's information */
- /* if (phead == plist) { */
+ * with this beacon's information
+ */
if (!target_find) {
if (list_empty(&pmlmepriv->free_bss_pool.queue)) {
/* If there are no more slots, expire the oldest */
- /* list_del_init(&oldest->list); */
pnetwork = oldest;
if (!pnetwork)
goto exit;
@@ -880,8 +842,8 @@ static void find_network(struct adapter *adapter)
}
/*
-*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock
-*/
+ * rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock
+ */
void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
{
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@@ -916,8 +878,8 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
}
/*
-*rtw_indicate_connect: the caller has to lock pmlmepriv->lock
-*/
+ * rtw_indicate_connect: the caller has to lock pmlmepriv->lock
+ */
void rtw_indicate_connect(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -937,8 +899,8 @@ void rtw_indicate_connect(struct adapter *padapter)
}
/*
-*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock
-*/
+ * rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock
+ */
void rtw_indicate_disconnect(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -1522,9 +1484,9 @@ void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf)
}
/*
-* _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss
-* @adapter: pointer to struct adapter structure
-*/
+ * _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss
+ * @adapter: pointer to struct adapter structure
+ */
void _rtw_join_timeout_handler(struct timer_list *t)
{
struct adapter *adapter = from_timer(adapter, t,
@@ -1566,9 +1528,9 @@ void _rtw_join_timeout_handler(struct timer_list *t)
}
/*
-* rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey
-* @adapter: pointer to struct adapter structure
-*/
+ * rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey
+ * @adapter: pointer to struct adapter structure
+ */
void rtw_scan_timeout_handler(struct timer_list *t)
{
struct adapter *adapter = from_timer(adapter, t,
@@ -1686,10 +1648,10 @@ void rtw_set_scan_deny(struct adapter *adapter, u32 ms)
}
/*
-* Select a new roaming candidate from the original @param candidate and @param competitor
-* @return true: candidate is updated
-* @return false: candidate is not updated
-*/
+ * Select a new roaming candidate from the original @param candidate and @param competitor
+ * @return true: candidate is updated
+ * @return false: candidate is not updated
+ */
static int rtw_check_roaming_candidate(struct mlme_priv *mlme
, struct wlan_network **candidate, struct wlan_network *competitor)
{
@@ -1769,12 +1731,13 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme)
}
/*
-* Select a new join candidate from the original @param candidate and @param competitor
-* @return true: candidate is updated
-* @return false: candidate is not updated
-*/
-static int rtw_check_join_candidate(struct mlme_priv *mlme
- , struct wlan_network **candidate, struct wlan_network *competitor)
+ * Select a new join candidate from the original @param candidate and @param competitor
+ * @return true: candidate is updated
+ * @return false: candidate is not updated
+ */
+static int rtw_check_join_candidate(struct mlme_priv *mlme,
+ struct wlan_network **candidate,
+ struct wlan_network *competitor)
{
int updated = false;
struct adapter *adapter = container_of(mlme, struct adapter, mlmepriv);
@@ -1813,11 +1776,11 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme
}
/*
-Calling context:
-The caller of the sub-routine will be in critical section...
-The caller must hold the following spinlock
-pmlmepriv->lock
-*/
+ * Calling context:
+ * The caller of the sub-routine will be in critical section...
+ * The caller must hold the following spinlock
+ * pmlmepriv->lock
+ */
int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
{
@@ -2084,14 +2047,6 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u
} else if ((authmode == WLAN_EID_VENDOR_SPECIFIC) || (authmode == WLAN_EID_RSN)) {
/* copy RSN or SSN */
memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypriv->supplicant_ie[1]+2);
- /* debug for CONFIG_IEEE80211W
- {
- int jj;
- printk("supplicant_ie_length =%d &&&&&&&&&&&&&&&&&&&\n", psecuritypriv->supplicant_ie[1]+2);
- for (jj = 0; jj < psecuritypriv->supplicant_ie[1]+2; jj++)
- printk(" %02x ", psecuritypriv->supplicant_ie[jj]);
- printk("\n");
- }*/
ielength += psecuritypriv->supplicant_ie[1]+2;
rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 4/4] Staging: rtl8723bs: fix else after break warning
2024-02-01 14:04 [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c Meir Elisha
` (2 preceding siblings ...)
2024-02-01 14:04 ` [PATCH v2 3/4] Staging: rtl8723bs: Fix block comments warning Meir Elisha
@ 2024-02-01 14:04 ` Meir Elisha
2024-02-02 8:00 ` Dan Carpenter
2024-02-01 21:26 ` [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c Philipp Hortmann
4 siblings, 1 reply; 8+ messages in thread
From: Meir Elisha @ 2024-02-01 14:04 UTC (permalink / raw)
To: Greg Kroah-Hartman, Hans de Goede, Ruan Jinjie, Yang Yingliang
Cc: linux-staging, linux-kernel, Meir Elisha
Fix checkpatch warning:
else is not generally useful after a break or return
Signed-off-by: Meir Elisha <meir6264@Gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 40 +++++++++--------------
1 file changed, 16 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 13bc0ebca247..6a9b57fd1a97 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1498,30 +1498,25 @@ void _rtw_join_timeout_handler(struct timer_list *t)
spin_lock_bh(&pmlmepriv->lock);
- if (rtw_to_roam(adapter) > 0) { /* join timeout caused by roaming */
+ if (rtw_to_roam(adapter) == 0) {
+ rtw_indicate_disconnect(adapter);
+ free_scanqueue(pmlmepriv);
+ /* indicate disconnect for the case that join_timeout
+ * and check_fwstate != FW_LINKED
+ */
+ rtw_cfg80211_indicate_disconnect(adapter);
+ } else { /* join timeout caused by roaming */
while (1) {
rtw_dec_to_roam(adapter);
- if (rtw_to_roam(adapter) != 0) { /* try another */
- int do_join_r;
-
- do_join_r = rtw_do_join(adapter);
- if (do_join_r != _SUCCESS)
- continue;
-
- break;
- } else {
+ if (rtw_to_roam(adapter) == 0) {
rtw_indicate_disconnect(adapter);
break;
+ } else if (rtw_do_join(adapter) != _SUCCESS) { /* try another */
+ continue;
}
- }
-
- } else {
- rtw_indicate_disconnect(adapter);
- free_scanqueue(pmlmepriv);/* */
-
- /* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */
- rtw_cfg80211_indicate_disconnect(adapter);
+ break;
+ }
}
spin_unlock_bh(&pmlmepriv->lock);
@@ -2052,12 +2047,9 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u
}
iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid);
- if (iEntry < 0) {
- return ielength;
- } else {
- if (authmode == WLAN_EID_RSN)
- ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
- }
+ if (iEntry > 0 && authmode == WLAN_EID_RSN)
+ ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
+
return ielength;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c
2024-02-01 14:04 [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c Meir Elisha
` (3 preceding siblings ...)
2024-02-01 14:04 ` [PATCH v2 4/4] Staging: rtl8723bs: fix else after break warning Meir Elisha
@ 2024-02-01 21:26 ` Philipp Hortmann
4 siblings, 0 replies; 8+ messages in thread
From: Philipp Hortmann @ 2024-02-01 21:26 UTC (permalink / raw)
To: Meir Elisha, Greg Kroah-Hartman, Hans de Goede, Ruan Jinjie,
Yang Yingliang
Cc: linux-staging, linux-kernel
On 2/1/24 15:04, Meir Elisha wrote:
> Checkpatch fix series for rtw_mlme.c
>
> ---
> Changes in v2:
> - Remove dead code
> - Fix comment in _rtw_join_timeout_handler()
>
> Meir Elisha (4):
> Staging: rtl8723bs: Remove unnecessary braces
> Staging: rtl8723bs: Remove extra spaces
> Staging: rtl8723bs: Fix block comments warning
> Staging: rtl8723bs: fix else after break warning
>
> drivers/staging/rtl8723bs/core/rtw_mlme.c | 227 ++++++++--------------
> 1 file changed, 81 insertions(+), 146 deletions(-)
>
Hi Meir,
please keep the emailaddess send from and the Signed-off-by emailaddress
exactly the same. The difference is the
"G" of gmail. One time it is upper case and one time lower case.
The changelog for the coverletter is good but the changelog for each
patch is missing. There the "---" are missing with chagelog.
Please use more unique descriptions for your patches. "Remove extra
spaces" can be an issue for hundred of times in a driver.
Look into accepted patches of the git for better examples.
I think the maintainer will not like your patch description. He will
typically respond with:
- You did not specify a description of why the patch is needed, or
possibly, any description at all, in the email body. Please read the
section entitled "The canonical patch format" in the kernel file,
Documentation/process/submitting-patches.rst for what is needed in
order to properly describe the change.
Very important here is the why and not to describe what you did.
Look into accepted patches of the git for better examples.
Thanks for your support.
Bye Philipp
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/4] Staging: rtl8723bs: Remove extra spaces
2024-02-01 14:04 ` [PATCH v2 2/4] Staging: rtl8723bs: Remove extra spaces Meir Elisha
@ 2024-02-02 7:21 ` Dan Carpenter
0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2024-02-02 7:21 UTC (permalink / raw)
To: Meir Elisha
Cc: Greg Kroah-Hartman, Hans de Goede, Ruan Jinjie, Yang Yingliang,
linux-staging, linux-kernel
On Thu, Feb 01, 2024 at 04:04:57PM +0200, Meir Elisha wrote:
> Fix checkpatch warning: please, no space before tabs
>
> Signed-off-by: Meir Elisha <meir6264@Gmail.com>
> ---
> drivers/staging/rtl8723bs/core/rtw_mlme.c | 63 ++++++++++-------------
> 1 file changed, 26 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> index 5568215b35bd..44b77c1ba992 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> @@ -169,7 +169,6 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor
> {
> unsigned int delta_time;
> u32 lifetime = SCANQUEUE_LIFETIME;
> -/* _irqL irqL; */
> struct __queue *free_queue = &(pmlmepriv->free_bss_pool);
>
> if (!pnetwork)
Please the "delete dead code" stuff into a separate patch. It's a
little bit easier to review when patches are split up like that.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 4/4] Staging: rtl8723bs: fix else after break warning
2024-02-01 14:04 ` [PATCH v2 4/4] Staging: rtl8723bs: fix else after break warning Meir Elisha
@ 2024-02-02 8:00 ` Dan Carpenter
0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2024-02-02 8:00 UTC (permalink / raw)
To: Meir Elisha
Cc: Greg Kroah-Hartman, Hans de Goede, Ruan Jinjie, Yang Yingliang,
linux-staging, linux-kernel
On Thu, Feb 01, 2024 at 04:04:59PM +0200, Meir Elisha wrote:
> Fix checkpatch warning:
> else is not generally useful after a break or return
>
This commit message doesn't work. It needs to explain why you didn't
just delete the else statement and pull the code in tab. And, honestly,
that's what you should have done...
regards,
dan carpenter
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index b221913733fb..c99fa5f1716a 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1552,10 +1552,9 @@ void _rtw_join_timeout_handler(struct timer_list *t)
continue;
}
break;
- } else {
- rtw_indicate_disconnect(adapter);
- break;
}
+ rtw_indicate_disconnect(adapter);
+ break;
}
} else {
@@ -2103,12 +2102,12 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u
}
iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid);
- if (iEntry < 0) {
+ if (iEntry < 0)
return ielength;
- } else {
- if (authmode == WLAN_EID_RSN)
- ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
- }
+
+ if (authmode == WLAN_EID_RSN)
+ ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
+
return ielength;
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-02-02 8:00 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-01 14:04 [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c Meir Elisha
2024-02-01 14:04 ` [PATCH v2 1/4] Staging: rtl8723bs: Remove unnecessary braces Meir Elisha
2024-02-01 14:04 ` [PATCH v2 2/4] Staging: rtl8723bs: Remove extra spaces Meir Elisha
2024-02-02 7:21 ` Dan Carpenter
2024-02-01 14:04 ` [PATCH v2 3/4] Staging: rtl8723bs: Fix block comments warning Meir Elisha
2024-02-01 14:04 ` [PATCH v2 4/4] Staging: rtl8723bs: fix else after break warning Meir Elisha
2024-02-02 8:00 ` Dan Carpenter
2024-02-01 21:26 ` [PATCH v2 0/4] Staging: rtl8723bs: checkpatch fixes for rtw_mlme.c Philipp Hortmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).