Re: [PATCH 04/11] staging: rtl8723bs: moved function prototypes out of core/rtw_recv.c

Greg KH
2021-03-22T16:10:34Z

On Mon, Mar 22, 2021 at 03:31:42PM +0100, Fabio Aiuto wrote:
> fix the following checkpatch issues:
>
> WARNING: externs should be avoided in .c files
> 1190: FILE: drivers/staging/rtl8723bs/core/rtw_recv.c:1190:
> +signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame);
>
> and then moved all function prototypes but one in include/rtw_recv.h
>
> Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
> ---
> drivers/staging/rtl8723bs/core/rtw_recv.c | 31 +-----------
> drivers/staging/rtl8723bs/include/rtw_recv.h | 51 ++++++++++++++++++++
> 2 files changed, 52 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
> index 1fa381663b4c..9ef2408ded57 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_recv.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
> @@ -305,7 +305,6 @@ struct recv_buf *rtw_dequeue_recvbuf(struct __queue *queue)
>
> }
>
> -signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe);
> signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe)
> {
>
> @@ -435,8 +434,6 @@ signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *precvfra
>
> }
>
> -/* decrypt and set the ivlen, icvlen of the recv_frame */
> -union recv_frame *decryptor(struct adapter *padapter, union recv_frame *precv_frame);
> union recv_frame *decryptor(struct adapter *padapter, union recv_frame *precv_frame)
> {
>
> @@ -527,8 +524,6 @@ union recv_frame *decryptor(struct adapter *padapter, union recv_frame *precv_fr
> return return_packet;
> }
>
> -/* set the security information in the recv_frame */
> -union recv_frame *portctrl(struct adapter *adapter, union recv_frame *precv_frame);
> union recv_frame *portctrl(struct adapter *adapter, union recv_frame *precv_frame)
> {
> u8 *psta_addr = NULL;
> @@ -606,7 +601,6 @@ union recv_frame *portctrl(struct adapter *adapter, union recv_frame *precv_fram
> return prtnframe;
> }
>
> -signed int recv_decache(union recv_frame *precv_frame, u8 bretry, struct stainfo_rxcache *prxcache);
> signed int recv_decache(union recv_frame *precv_frame, u8 bretry, struct stainfo_rxcache *prxcache)
> {
> signed int tid = precv_frame->u.hdr.attrib.priority;
> @@ -634,7 +628,6 @@ signed int recv_decache(union recv_frame *precv_frame, u8 bretry, struct stainfo
>
> }
>
> -void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame);
> void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame)
> {
> unsigned char pwrbit;
> @@ -671,7 +664,6 @@ void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame
> }
> }
>
> -void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame);
> void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame)
> {
> struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
> @@ -723,7 +715,6 @@ void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame)
> }
> }
>
> -void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, struct sta_info *sta);
> void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, struct sta_info *sta)
> {
> int sz;
> @@ -755,8 +746,6 @@ void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, struct
> traffic_check_for_leave_lps(padapter, false, 0);
> }
>
> -signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *precv_frame,
> - struct sta_info **psta);
> signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *precv_frame,
> struct sta_info **psta)
> {
> @@ -850,8 +839,6 @@ signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *precv_f
> return ret;
> }
>
> -signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *precv_frame,
> - struct sta_info **psta);
> signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *precv_frame,
> struct sta_info **psta)
> {
> @@ -992,8 +979,6 @@ signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *precv_fr
> return ret;
> }
>
> -signed int sta2ap_data_frame(struct adapter *adapter, union recv_frame *precv_frame,
> - struct sta_info **psta);
> signed int sta2ap_data_frame(struct adapter *adapter, union recv_frame *precv_frame,
> struct sta_info **psta)
> {
> @@ -1049,7 +1034,6 @@ signed int sta2ap_data_frame(struct adapter *adapter, union recv_frame *precv_fr
> return ret;
> }
>
> -signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_frame);
> signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_frame)
> {
> struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
> @@ -1186,8 +1170,6 @@ signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *
>
> }
>
> -union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union recv_frame *precv_frame);
> -signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame);
> signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame)
> {
> /* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */
> @@ -1227,7 +1209,6 @@ signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *
>
> }
>
> -signed int validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame);
> signed int validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame)
> {
> u8 bretry;
> @@ -1459,7 +1440,6 @@ static inline void dump_rx_packet(u8 *ptr)
> DBG_871X("#############################\n");
> }
>
> -signed int validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame);
> signed int validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
> {
> /* shall check frame subtype, to / from ds, da, bssid */
> @@ -1557,9 +1537,6 @@ signed int validate_recv_frame(struct adapter *adapter, union recv_frame *precv_
> return retval;
> }
>
> -
> -/* remove the wlanhdr and add the eth_hdr */
> -signed int wlanhdr_to_ethhdr(union recv_frame *precvframe);
> signed int wlanhdr_to_ethhdr(union recv_frame *precvframe)
> {
> signed int rmv_len;
> @@ -1886,7 +1863,6 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
> return _SUCCESS;
> }
>
> -int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num);
> int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
> {
> struct adapter *padapter = preorder_ctrl->padapter;
> @@ -1955,7 +1931,6 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
> return true;
> }
>
> -int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union recv_frame *prframe);
> int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union recv_frame *prframe)
> {
> struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
> @@ -2017,7 +1992,7 @@ void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 prev_seq, u
> pdbgpriv->dbg_rx_ampdu_loss_count += (current_seq - prev_seq);
>
> }
> -int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced);
> +
> int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
> {
> struct list_head *phead, *plist;
> @@ -2125,7 +2100,6 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr
> return bPktInBuf;
> }
>
> -int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe);
> int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe)
> {
> int retval = _SUCCESS;
> @@ -2279,7 +2253,6 @@ void rtw_reordering_ctrl_timeout_handler(struct timer_list *t)
>
> }
>
> -int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe);
> int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe)
> {
> int retval = _SUCCESS;
> @@ -2402,8 +2375,6 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
> return ret;
> }
>
> -
> -int recv_func(struct adapter *padapter, union recv_frame *rframe);

Shouldn't this just be a static function? And same for others in here?

thanks,

greg k-h