staging: rtl8723bs: clean up management transmit return values
v2 cover staging: rtl8723bs: clean up management transmit return values
This series continues the cleanup of management transmit return values in the rtl8723bs driver.
Patch 1 converts rtw_mgmt_xmitframe_coalesce() to return kernel-style errno values.
Patch 2 propagates the new return value convention through rtw_hal_mgnt_xmit().
Patch 3 makes dump_mgntframe_and_wait() return void, since none of its current callers use its return value. It still uses the return value from rtw_hal_mgnt_xmit() internally to determine whether to wait for completion.
Changes in v2:
- Clarify commit messages based on review feedback.
- Make dump_mgntframe_and_wait() return void instead of converting it to errno values.
Hungyu Lin (3):
staging: rtl8723bs: convert mgmt xmit coalesce to errno
staging: rtl8723bs: propagate errno handling for mgmt xmit
staging: rtl8723bs: make dump_mgntframe_and_wait() return void
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 13 ++++--------- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 ++++---- drivers/staging/rtl8723bs/hal/hal_intf.c | 9 +++++++-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/3 staging: rtl8723bs: convert mgmt xmit coalesce to errno
Change rtw_mgmt_xmitframe_coalesce() to use kernel-style return values.
Return 0 on success and negative errno on failure. The only caller currently doesn't check for errors, so this change does not affect runtime behavior. Later patches in this series will propagate error handling to the caller.
--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 ++++---- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_xmit.c +4 -4
@@ -1187,7 +1187,7 @@ int rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct }/* broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption */ -s32 rtw_mgmt_xmitframe_coalesce (struct adapter *padapter,struct sk_buff *pkt,struct xmit_frame *pxmitframe) +int rtw_mgmt_xmitframe_coalesce (struct adapter *padapter,struct sk_buff *pkt,struct xmit_frame *pxmitframe) {u8 *pframe, *mem_start =NULL , *tmp_buf =NULL ;u8 subtype;
@@ -1210,7 +1210,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, sBIP_AAD =kzalloc (ori_len,GFP_ATOMIC );if (!BIP_AAD ) -return _FAIL; +return -ENOMEM ; tmp_buf =BIP_AAD ; subtype =GetFrameSubType (pframe);/* bit(7)~bit(2) */
@@ -1341,12 +1341,12 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s xmitframe_coalesce_success:spin_unlock_bh (&padapter->security_key_mutex);kfree (BIP_AAD ); -return _SUCCESS; +return 0 ; xmitframe_coalesce_fail:spin_unlock_bh (&padapter->security_key_mutex);kfree (BIP_AAD ); -return _FAIL; +return -EINVAL ; }/* Logical Link Control(LLC) SubNetwork Attachment Point(SNAP) header
drivers/staging/rtl8723bs/include/rtw_xmit.h +1 -1
@@ -424,7 +424,7 @@ int rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframextern u32 rtw_calculate_wlan_pkt_size_by_attribue (struct pkt_attrib *pattrib);#define rtw_wlan_pkt_size (f) rtw_calculate_wlan_pkt_size_by_attribue(&f->attrib)extern int rtw_xmitframe_coalesce (struct adapter *padapter,struct sk_buff *pkt,struct xmit_frame *pxmitframe); -extern s32 rtw_mgmt_xmitframe_coalesce (struct adapter *padapter,struct sk_buff *pkt,struct xmit_frame *pxmitframe); +extern int rtw_mgmt_xmitframe_coalesce (struct adapter *padapter,struct sk_buff *pkt,struct xmit_frame *pxmitframe);s32 _rtw_init_hw_txqueue (struct hw_txqueue *phw_txqueue,u8 ac_tag);void _rtw_init_sta_xmit_priv (struct sta_xmit_priv *psta_xmitpriv);
Signature · 1 line
2.43.0
PATCH v2 2/3 staging: rtl8723bs: propagate errno handling for mgmt xmit
In reply to Hungyu LinConvert rtw_hal_mgnt_xmit() to return errno-style values and update the prototype in hal_intf.h.
After this change, dump_mgntframe_and_wait() still uses the return value of rtw_hal_mgnt_xmit() to determine whether it should wait for completion. A follow-on patch will make dump_mgntframe_and_wait() return void since its return value is unused by all current callers.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++++ drivers/staging/rtl8723bs/hal/hal_intf.c | 9 +++++++-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +4 -0
@@ -1990,6 +1990,10 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr pxmitbuf->sctx = &sctx; ret =rtw_hal_mgnt_xmit (padapter, pmgntframe); +if (ret) + ret = _FAIL; +else + ret = _SUCCESS;if (ret == _SUCCESS) ret =rtw_sctx_wait (&sctx);
drivers/staging/rtl8723bs/hal/hal_intf.c +7 -2
@@ -115,8 +115,10 @@ s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe)/* * [IMPORTANT] This function would be run in interrupt context. */ -s32 rtw_hal_mgnt_xmit (struct adapter *padapter,struct xmit_frame *pmgntframe) +int rtw_hal_mgnt_xmit (struct adapter *padapter,struct xmit_frame *pmgntframe) { +int ret; +update_mgntframe_attrib_addr (padapter, pmgntframe);/* pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; */ /* pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; */
@@ -130,7 +132,10 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) pmgntframe->attrib.encrypt = _AES_; pmgntframe->attrib.bswenc = true; } -rtw_mgmt_xmitframe_coalesce (padapter, pmgntframe->pkt, pmgntframe); + ret =rtw_mgmt_xmitframe_coalesce (padapter, pmgntframe->pkt, pmgntframe); + +if (ret) +return ret; }return rtl8723bs_mgnt_xmit (padapter, pmgntframe);
drivers/staging/rtl8723bs/include/hal_intf.h +1 -1
@@ -197,7 +197,7 @@ u8 rtw_hal_check_ips_status(struct adapter *padapter);int rtw_hal_xmitframe_enqueue (struct adapter *padapter,struct xmit_frame *pxmitframe);s32 rtw_hal_xmit (struct adapter *padapter,struct xmit_frame *pxmitframe); -s32 rtw_hal_mgnt_xmit (struct adapter *padapter,struct xmit_frame *pmgntframe); +int rtw_hal_mgnt_xmit (struct adapter *padapter,struct xmit_frame *pmgntframe);s32 rtw_hal_init_xmit_priv (struct adapter *padapter);void rtw_hal_free_xmit_priv (struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH v2 3/3 staging: rtl8723bs: make dump_mgntframe_and_wait() return void
In reply to Hungyu LinThe return value of dump_mgntframe_and_wait() is ignored by all current callers.
Keep using the return value of rtw_hal_mgnt_xmit() to determine whether to wait for completion. Make dump_mgntframe_and_wait() return void because no caller uses its return value.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 17 ++++------------- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +4 -13
@@ -1971,9 +1971,8 @@ void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe)rtw_hal_mgnt_xmit (padapter, pmgntframe); } -s32 dump_mgntframe_and_wait (struct adapter *padapter,struct xmit_frame *pmgntframe,int timeout_ms) +void dump_mgntframe_and_wait (struct adapter *padapter,struct xmit_frame *pmgntframe,int timeout_ms) { -s32 ret = _FAIL;unsigned long irqL;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
@@ -1983,26 +1982,18 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr padapter->bDriverStopped) {rtw_free_xmitbuf (&padapter->xmitpriv, pmgntframe->pxmitbuf);rtw_free_xmitframe (&padapter->xmitpriv, pmgntframe); -return ret; +return ; }rtw_sctx_init (&sctx, timeout_ms); pxmitbuf->sctx = &sctx; - ret =rtw_hal_mgnt_xmit (padapter, pmgntframe); -if (ret) - ret = _FAIL; -else - ret = _SUCCESS; - -if (ret == _SUCCESS) - ret =rtw_sctx_wait (&sctx); +if (!rtw_hal_mgnt_xmit (padapter, pmgntframe)) +rtw_sctx_wait (&sctx);spin_lock_irqsave (&pxmitpriv->lock_sctx, irqL); pxmitbuf->sctx =NULL ;spin_unlock_irqrestore (&pxmitpriv->lock_sctx, irqL); - -return ret; }s32 dump_mgntframe_and_wait_ack (struct adapter *padapter,struct xmit_frame *pmgntframe)
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
@@ -533,7 +533,7 @@ void update_mgnt_tx_rate(struct adapter *padapter, u8 rate);void update_mgntframe_attrib (struct adapter *padapter,struct pkt_attrib *pattrib);void update_mgntframe_attrib_addr (struct adapter *padapter,struct xmit_frame *pmgntframe);void dump_mgntframe (struct adapter *padapter,struct xmit_frame *pmgntframe); -s32 dump_mgntframe_and_wait (struct adapter *padapter,struct xmit_frame *pmgntframe,int timeout_ms); +void dump_mgntframe_and_wait (struct adapter *padapter,struct xmit_frame *pmgntframe,int timeout_ms);s32 dump_mgntframe_and_wait_ack (struct adapter *padapter,struct xmit_frame *pmgntframe);void issue_beacon (struct adapter *padapter,int timeout_ms);
Signature · 1 line
2.43.0
Quoted 19 lines · Hungyu Lin
This series continues the cleanup of management transmit return values in the rtl8723bs driver.
Patch 1 converts
rtw_mgmt_xmitframe_coalesce()to return kernel-style errno values.Patch 2 propagates the new return value convention through
rtw_hal_mgnt_xmit().Patch 3 makes
dump_mgntframe_and_wait()return void, since none of its current callers use its return value. It still uses the return value fromrtw_hal_mgnt_xmit()internally to determine whether to wait for completion.Changes in v2:
- Clarify commit messages based on review feedback.
- Makedump_mgntframe_and_wait()return void instead of converting it to errno values.
Quoted 4 lines
Hungyu Lin (3):
staging: rtl8723bs: convert mgmt xmit coalesce to errno
staging: rtl8723bs: propagate errno handling for mgmt xmit
staging: rtl8723bs: makedump_mgntframe_and_wait()return void
Thanks!
regards,
dan carpenter