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: Aastha Gupta <aastha.gupta4104@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
index 01f78d1671de4ed7bafd70a717b7048861adb4d4..79aa02afad018aa7912472d81778bb6b3618c9d1 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -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;
        }
 }
 

diff --git a/drivers/staging/rtl8723bs/core/rtw_debug.c b/drivers/staging/rtl8723bs/core/rtw_debug.c
index 3db02e9f27abd49d4d8cd961d14b2ebd3e8e63fb..b5dd244fee8fe51dc82f3a009e744f8256e8a222 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_debug.c
+++ b/drivers/staging/rtl8723bs/core/rtw_debug.c
@@ -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*/

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 355ce9b19d1c7b6f53c8754158bd1379130f5fd6..4be9eb2ccde339a56311284dd30e2de6e2fd641d 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -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 */

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index a1695348d1d5931a8097f53aa60bc39cfc30ecce..f6dc26c8bd3d09eec93820da227a7c79e02fe51e 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -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;
        }
 
 }

diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index 4d14fbc5a1fe688ae6583e11ce4d6877d5d17aae..6812dd054c8e5497cc296319df5cbce405b0784b 100644 (file)
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -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;

diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index f3952463697eb197e2e6c8e313f9e3e03ebb0654..0d22aaf4865a1126b5ce0115f3e5c80b163b2cf8 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -424,7 +424,7 @@ struct mlme_ext_info
        u8 candidate_tid_bitmap;
        u8 dialogToken;
        /*  Accept ADDBA Request */
-       bool bAcceptAddbaReq;
+       bool accept_addba_req;
        u8 bwmode_updated;
        u8 hidden_ssid_mode;
        u8 VHT_enable;

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 33e8098c34ddd671485962c7569efc9f51014ef9..7837915c16bf42e11ceafe81dff6baaacef9680b 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -311,7 +311,7 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
        registry_par->bt_ampdu = (u8)rtw_bt_ampdu;
        registry_par->ant_num = (s8)rtw_ant_num;
 
-       registry_par->bAcceptAddbaReq = (u8)rtw_AcceptAddbaReq;
+       registry_par->accept_addba_req = (u8)rtw_AcceptAddbaReq;
 
        registry_par->antdiv_cfg = (u8)rtw_antdiv_cfg;
        registry_par->antdiv_type = (u8)rtw_antdiv_type;