Commit c87c2b0d authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: we always enqueue in rtw_set_chplan_cmd 



The only caller of rtw_set_chplan_cmd requests that the message be
enqueued and not sent directly.

Remove the enqueue parameter and the code for direct sending.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220108124959.313215-13-martin@kaiser.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5495a7ea

drivers/staging/r8188eu/core/rtw_cmd.c

+9 −17
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter) 
	return res;

}



u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue)

u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan)

{

	struct	cmd_obj *pcmdobj;

	struct	SetChannelPlan_param *setChannelPlan_param;
@@ -859,7 +859,6 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue) 
	}

	setChannelPlan_param->channel_plan = chplan;



	if (enqueue) {

	/* need enqueue, prepare cmd_obj and enqueue */

	pcmdobj = kzalloc(sizeof(struct	cmd_obj), GFP_KERNEL);

	if (!pcmdobj) {
@@ -870,13 +869,6 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue) 


	init_h2fwcmd_w_parm_no_rsp(pcmdobj, setChannelPlan_param, GEN_CMD_CODE(_SetChannelPlan));

	res = rtw_enqueue_cmd(pcmdpriv, pcmdobj);

	} else {

		/* no need to enqueue, do the cmd hdl directly and free cmd parameter */

		if (H2C_SUCCESS != set_chplan_hdl(padapter, (unsigned char *)setChannelPlan_param))

			res = _FAIL;



		kfree(setChannelPlan_param);

	}



	/* do something based on res... */

	if (res == _SUCCESS)

drivers/staging/r8188eu/include/rtw_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ u8 rtw_ps_cmd(struct adapter*padapter); 


u8 rtw_chk_hi_queue_cmd(struct adapter*padapter);



u8 rtw_set_chplan_cmd(struct adapter*padapter, u8 chplan, u8 enqueue);

u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan);



u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt);

drivers/staging/r8188eu/os_dep/ioctl_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -2098,7 +2098,7 @@ static int rtw_wx_set_channel_plan(struct net_device *dev, 
	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	u8 channel_plan_req = (u8)(*((int *)wrqu));



	if (_SUCCESS == rtw_set_chplan_cmd(padapter, channel_plan_req, 1))

	if (_SUCCESS == rtw_set_chplan_cmd(padapter, channel_plan_req))

		DBG_88E("%s set channel_plan = 0x%02X\n", __func__, pmlmepriv->ChannelPlan);

	else

		return -EPERM;