Re: [PATCH RESEND 06/16] staging: rtl8188eu: rtw_cmd.c: reorder callbacks

[Larry Finger <Larry.Finger@xxxxxxxxxxxx>]

On 08/28/2015 03:45 PM, Luca Ceresoli wrote:
> These callbacks are only referenced from rtw_cmd_callback (rtw_cmd.c),
> which in turn is only used in rtw_cmd.c (this same file), so they are
> actually internal functions.
>
> rtw_cmd_callback will be moved in this C file, and these callbacks
> declared static, in a later commit.
>
> This would break compilation, since the callbacks are are referenced
> (via rtw_cmd_callback) before their definition.
>
> Reorder these functions so that symbols are defined before they are
> referenced, without the need for forward declarations.
>
> This commit only reorders code, there is no content change.

Once again, this would be a perfect place to fix the long lines.

Larry

> Signed-off-by: Luca Ceresoli <luca@xxxxxxxxxxxxxxxx>
> Cc: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxx>
> ---
>   drivers/staging/rtl8188eu/core/rtw_cmd.c | 335 ++++++++++++++++---------------
>   1 file changed, 168 insertions(+), 167 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
> index 3a8d4d5237d2..700686ec8798 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
> @@ -43,6 +43,174 @@ static struct cmd_hdl wlancmds[] = {
>   	{sizeof(struct SetChannelPlan_param), set_chplan_hdl},
>   };
>
> +void rtw_survey_cmd_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
> +{
> +	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;
> +
> +
> +	if (pcmd->res == H2C_DROPPED) {
> +		/* TODO: cancel timer and do timeout handler directly... */
> +		/* need to make timeout handlerOS independent */
> +		mod_timer(&pmlmepriv->scan_to_timer,
> +			  jiffies + msecs_to_jiffies(1));
> +	} else if (pcmd->res != H2C_SUCCESS) {
> +		mod_timer(&pmlmepriv->scan_to_timer,
> +			  jiffies + msecs_to_jiffies(1));
> +		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: MgntActrtw_set_802_11_bssid_LIST_SCAN Fail ************\n\n."));
> +	}
> +
> +	/*  free cmd */
> +	rtw_free_cmd_obj(pcmd);
> +
> +}
> +
> +void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
> +{
> +	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;
> +
> +
> +	if (pcmd->res != H2C_SUCCESS) {
> +		spin_lock_bh(&pmlmepriv->lock);
> +		set_fwstate(pmlmepriv, _FW_LINKED);
> +		spin_unlock_bh(&pmlmepriv->lock);
> +
> +		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ***Error: disconnect_cmd_callback Fail ***\n."));
> +		return;
> +	}
> +
> +	/*  free cmd */
> +	rtw_free_cmd_obj(pcmd);
> +}
> +
> +void rtw_joinbss_cmd_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
> +{
> +	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;
> +
> +
> +	if (pcmd->res == H2C_DROPPED) {
> +		/* TODO: cancel timer and do timeout handler directly... */
> +		/* need to make timeout handlerOS independent */
> +		mod_timer(&pmlmepriv->assoc_timer,
> +			  jiffies + msecs_to_jiffies(1));
> +	} else if (pcmd->res != H2C_SUCCESS) {
> +		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("********Error:rtw_select_and_join_from_scanned_queue Wait Sema  Fail ************\n"));
> +		mod_timer(&pmlmepriv->assoc_timer,
> +			  jiffies + msecs_to_jiffies(1));
> +	}
> +
> +	rtw_free_cmd_obj(pcmd);
> +
> +}
> +
> +void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
> +{
> +	struct sta_info *psta = NULL;
> +	struct wlan_network *pwlan = NULL;
> +	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;
> +	struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;
> +	struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
> +
> +
> +	if (pcmd->res != H2C_SUCCESS) {
> +		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: rtw_createbss_cmd_callback  Fail ************\n\n."));
> +		mod_timer(&pmlmepriv->assoc_timer,
> +			  jiffies + msecs_to_jiffies(1));
> +	}
> +
> +	del_timer_sync(&pmlmepriv->assoc_timer);
> +
> +	spin_lock_bh(&pmlmepriv->lock);
> +
> +	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
> +		psta = rtw_get_stainfo(&padapter->stapriv, pnetwork->MacAddress);
> +		if (!psta) {
> +			psta = rtw_alloc_stainfo(&padapter->stapriv, pnetwork->MacAddress);
> +			if (psta == NULL) {
> +				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nCan't alloc sta_info when createbss_cmd_callback\n"));
> +				goto createbss_cmd_fail;
> +			}
> +		}
> +
> +		rtw_indicate_connect(padapter);
> +	} else {
> +		pwlan = _rtw_alloc_network(pmlmepriv);
> +		spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
> +		if (pwlan == NULL) {
> +			pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);
> +			if (pwlan == NULL) {
> +				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n Error:  can't get pwlan in rtw_joinbss_event_callback\n"));
> +				spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
> +				goto createbss_cmd_fail;
> +			}
> +			pwlan->last_scanned = jiffies;
> +		} else {
> +			list_add_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);
> +		}
> +
> +		pnetwork->Length = get_wlan_bssid_ex_sz(pnetwork);
> +		memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
> +
> +		memcpy(&tgt_network->network, pnetwork, (get_wlan_bssid_ex_sz(pnetwork)));
> +
> +		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
> +
> +		spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
> +		/*  we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) */
> +	}
> +
> +createbss_cmd_fail:
> +
> +	spin_unlock_bh(&pmlmepriv->lock);
> +
> +	rtw_free_cmd_obj(pcmd);
> +
> +}
> +
> +void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
> +{
> +	struct sta_priv *pstapriv = &padapter->stapriv;
> +	struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp);
> +	struct sta_info *psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr);
> +
> +
> +	if (psta == NULL) {
> +		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n"));
> +		goto exit;
> +	}
> +exit:
> +	rtw_free_cmd_obj(pcmd);
> +}
> +
> +void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
> +{
> +	struct sta_priv *pstapriv = &padapter->stapriv;
> +	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
> +	struct set_assocsta_parm *passocsta_parm = (struct set_assocsta_parm *)(pcmd->parmbuf);
> +	struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *)(pcmd->rsp);
> +	struct sta_info *psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr);
> +
> +
> +	if (psta == NULL) {
> +		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n\n"));
> +		goto exit;
> +	}
> +
> +	psta->aid = passocsta_rsp->cam_id;
> +	psta->mac_id = passocsta_rsp->cam_id;
> +
> +	spin_lock_bh(&pmlmepriv->lock);
> +
> +	if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) && (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true))
> +		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
> +
> +	set_fwstate(pmlmepriv, _FW_LINKED);
> +	spin_unlock_bh(&pmlmepriv->lock);
> +
> +exit:
> +	rtw_free_cmd_obj(pcmd);
> +
> +}
> +
>   /*
>   Caller and the rtw_cmd_thread can protect cmd_q by spin_lock.
>   No irqsave is necessary.
> @@ -1244,170 +1412,3 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)
>
>   	return H2C_SUCCESS;
>   }
> -
> -void rtw_survey_cmd_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
> -{
> -	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;
> -
> -
> -	if (pcmd->res == H2C_DROPPED) {
> -		/* TODO: cancel timer and do timeout handler directly... */
> -		/* need to make timeout handlerOS independent */
> -		mod_timer(&pmlmepriv->scan_to_timer,
> -			  jiffies + msecs_to_jiffies(1));
> -	} else if (pcmd->res != H2C_SUCCESS) {
> -		mod_timer(&pmlmepriv->scan_to_timer,
> -			  jiffies + msecs_to_jiffies(1));
> -		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: MgntActrtw_set_802_11_bssid_LIST_SCAN Fail ************\n\n."));
> -	}
> -
> -	/*  free cmd */
> -	rtw_free_cmd_obj(pcmd);
> -
> -}
> -void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
> -{
> -	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;
> -
> -
> -	if (pcmd->res != H2C_SUCCESS) {
> -		spin_lock_bh(&pmlmepriv->lock);
> -		set_fwstate(pmlmepriv, _FW_LINKED);
> -		spin_unlock_bh(&pmlmepriv->lock);
> -
> -		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ***Error: disconnect_cmd_callback Fail ***\n."));
> -		return;
> -	}
> -
> -	/*  free cmd */
> -	rtw_free_cmd_obj(pcmd);
> -}
> -
> -void rtw_joinbss_cmd_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
> -{
> -	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;
> -
> -
> -	if (pcmd->res == H2C_DROPPED) {
> -		/* TODO: cancel timer and do timeout handler directly... */
> -		/* need to make timeout handlerOS independent */
> -		mod_timer(&pmlmepriv->assoc_timer,
> -			  jiffies + msecs_to_jiffies(1));
> -	} else if (pcmd->res != H2C_SUCCESS) {
> -		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("********Error:rtw_select_and_join_from_scanned_queue Wait Sema  Fail ************\n"));
> -		mod_timer(&pmlmepriv->assoc_timer,
> -			  jiffies + msecs_to_jiffies(1));
> -	}
> -
> -	rtw_free_cmd_obj(pcmd);
> -
> -}
> -
> -void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
> -{
> -	struct sta_info *psta = NULL;
> -	struct wlan_network *pwlan = NULL;
> -	struct	mlme_priv *pmlmepriv = &padapter->mlmepriv;
> -	struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;
> -	struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
> -
> -
> -	if (pcmd->res != H2C_SUCCESS) {
> -		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: rtw_createbss_cmd_callback  Fail ************\n\n."));
> -		mod_timer(&pmlmepriv->assoc_timer,
> -			  jiffies + msecs_to_jiffies(1));
> -	}
> -
> -	del_timer_sync(&pmlmepriv->assoc_timer);
> -
> -	spin_lock_bh(&pmlmepriv->lock);
> -
> -	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
> -		psta = rtw_get_stainfo(&padapter->stapriv, pnetwork->MacAddress);
> -		if (!psta) {
> -			psta = rtw_alloc_stainfo(&padapter->stapriv, pnetwork->MacAddress);
> -			if (psta == NULL) {
> -				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nCan't alloc sta_info when createbss_cmd_callback\n"));
> -				goto createbss_cmd_fail;
> -			}
> -		}
> -
> -		rtw_indicate_connect(padapter);
> -	} else {
> -		pwlan = _rtw_alloc_network(pmlmepriv);
> -		spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
> -		if (pwlan == NULL) {
> -			pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);
> -			if (pwlan == NULL) {
> -				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n Error:  can't get pwlan in rtw_joinbss_event_callback\n"));
> -				spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
> -				goto createbss_cmd_fail;
> -			}
> -			pwlan->last_scanned = jiffies;
> -		} else {
> -			list_add_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);
> -		}
> -
> -		pnetwork->Length = get_wlan_bssid_ex_sz(pnetwork);
> -		memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
> -
> -		memcpy(&tgt_network->network, pnetwork, (get_wlan_bssid_ex_sz(pnetwork)));
> -
> -		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
> -
> -		spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
> -		/*  we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) */
> -	}
> -
> -createbss_cmd_fail:
> -
> -	spin_unlock_bh(&pmlmepriv->lock);
> -
> -	rtw_free_cmd_obj(pcmd);
> -
> -}
> -
> -void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
> -{
> -	struct sta_priv *pstapriv = &padapter->stapriv;
> -	struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp);
> -	struct sta_info *psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr);
> -
> -
> -	if (psta == NULL) {
> -		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n"));
> -		goto exit;
> -	}
> -exit:
> -	rtw_free_cmd_obj(pcmd);
> -}
> -
> -void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
> -{
> -	struct sta_priv *pstapriv = &padapter->stapriv;
> -	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
> -	struct set_assocsta_parm *passocsta_parm = (struct set_assocsta_parm *)(pcmd->parmbuf);
> -	struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *)(pcmd->rsp);
> -	struct sta_info *psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr);
> -
> -
> -	if (psta == NULL) {
> -		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n\n"));
> -		goto exit;
> -	}
> -
> -	psta->aid = passocsta_rsp->cam_id;
> -	psta->mac_id = passocsta_rsp->cam_id;
> -
> -	spin_lock_bh(&pmlmepriv->lock);
> -
> -	if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) && (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true))
> -		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
> -
> -	set_fwstate(pmlmepriv, _FW_LINKED);
> -	spin_unlock_bh(&pmlmepriv->lock);
> -
> -exit:
> -	rtw_free_cmd_obj(pcmd);
> -
> -}

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel