Commit 2646633f authored by Aastha Gupta's avatar Aastha Gupta Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: rename camelcase bAcceptAddbaReq 



bAcceptAddbaReq uses camelcase which is not according to Linux kernel
coding style.
There is a 'bAcceptAddbaReq' field both in struct mlme_ext_info and
in struct registry_priv.Rename both of them.

Signed-off-by: default avatarAastha Gupta <aastha.gupta4104@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4c249545

drivers/staging/rtl8723bs/core/rtw_btcoex.c

+2 −2
Original line number Diff line number Diff line
@@ -207,11 +207,11 @@ void rtw_btcoex_RejectApAggregatedPacket(struct adapter *padapter, u8 enable) 
	psta = rtw_get_stainfo(&padapter->stapriv, get_bssid(&padapter->mlmepriv));



	if (true == enable) {

		pmlmeinfo->bAcceptAddbaReq = false;

		pmlmeinfo->accept_addba_req = false;

		if (psta)

			send_delba(padapter, 0, psta->hwaddr);

	} else{

		pmlmeinfo->bAcceptAddbaReq = true;

		pmlmeinfo->accept_addba_req = true;

	}

}

drivers/staging/rtl8723bs/core/rtw_debug.c

+5 −3
Original line number Diff line number Diff line
@@ -1122,7 +1122,8 @@ int proc_get_rx_ampdu(struct seq_file *m, void *v) 


	if (pregpriv)

		DBG_871X_SEL_NL(m,

			"bAcceptAddbaReq = %d , 0:Reject AP's Add BA req, 1:Accept AP's Add BA req.\n", pmlmeinfo->bAcceptAddbaReq

			"accept_addba_req = %d , 0:Reject AP's Add BA req, 1:Accept AP's Add BA req.\n",

			pmlmeinfo->accept_addba_req

			);



	return 0;
@@ -1146,8 +1147,9 @@ ssize_t proc_set_rx_ampdu(struct file *file, const char __user *buffer, size_t c 
		sscanf(tmp, "%d ", &mode);



		if (pregpriv && mode < 2) {

			pmlmeinfo->bAcceptAddbaReq = mode;

			DBG_871X("pmlmeinfo->bAcceptAddbaReq =%d\n", pmlmeinfo->bAcceptAddbaReq);

			pmlmeinfo->accept_addba_req = mode;

			DBG_871X("pmlmeinfo->accept_addba_req =%d\n",

				 pmlmeinfo->accept_addba_req);

			if (mode == 0) {

				/*tear down Rx AMPDU*/

				send_delba(padapter, 0, get_my_bssid(&(pmlmeinfo->network)));/* recipient*/

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+2 −2
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ int init_mlme_ext_priv(struct adapter *padapter) 
	/* fill_fwpriv(padapter, &(pmlmeext->fwpriv)); */



	init_mlme_ext_priv_value(padapter);

	pmlmeinfo->bAcceptAddbaReq = pregistrypriv->bAcceptAddbaReq;

	pmlmeinfo->accept_addba_req = pregistrypriv->accept_addba_req;



	init_mlme_ext_timer(padapter);
@@ -1974,7 +1974,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra 
			/* process_addba_req(padapter, (u8 *)&(pmlmeinfo->ADDBA_req), GetAddr3Ptr(pframe)); */

			process_addba_req(padapter, (u8 *)&(pmlmeinfo->ADDBA_req), addr);



			if (pmlmeinfo->bAcceptAddbaReq) {

			if (pmlmeinfo->accept_addba_req) {

				issue_action_BA(padapter, addr, RTW_WLAN_ACTION_ADDBA_RESP, 0);

			} else{

				issue_action_BA(padapter, addr, RTW_WLAN_ACTION_ADDBA_RESP, 37);/* reject ADDBA Req */

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+1 −1
Original line number Diff line number Diff line
@@ -1946,7 +1946,7 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr) 
		preorder_ctrl->indicate_seq = 0xffff;

		#endif



		preorder_ctrl->enable = (pmlmeinfo->bAcceptAddbaReq == true) ? true : false;

		preorder_ctrl->enable = pmlmeinfo->accept_addba_req;

	}



}

drivers/staging/rtl8723bs/include/drv_types.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ struct registry_priv 
	u8 bt_ampdu;

	s8	ant_num;



	bool	bAcceptAddbaReq;

	bool	accept_addba_req;



	u8 antdiv_cfg;

	u8 antdiv_type;