diff mbox

[10/14] staging: wilc1000: rename ptstrJoinBssParam variable to avoid camelCase

Message ID 1516281432-7724-11-git-send-email-ajay.kathat@microchip.com (mailing list archive)
State Not Applicable
Delegated to: Kalle Valo
Headers show

Commit Message

Ajay Singh Jan. 18, 2018, 1:17 p.m. UTC 
fix "Avoid camelCase" issue reported by checkpatch.pl script.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/staging/wilc1000/host_interface.c | 78 +++++++++++++++----------------
 1 file changed, 39 insertions(+), 39 deletions(-)

Comments

Claudiu Beznea Jan. 19, 2018, 11:20 a.m. UTC | #1 
On 18.01.2018 15:17, Ajay Singh wrote:
> fix "Avoid camelCase" issue reported by checkpatch.pl script.
> 
> Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
> ---
>  drivers/staging/wilc1000/host_interface.c | 78 +++++++++++++++----------------
>  1 file changed, 39 insertions(+), 39 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
> index 4ddd1a8..cc27b5a 100644
> --- a/drivers/staging/wilc1000/host_interface.c
> +++ b/drivers/staging/wilc1000/host_interface.c
> @@ -909,7 +909,7 @@ static s32 Handle_Connect(struct wilc_vif *vif,
>  	struct wid wid_list[8];
>  	u32 wid_cnt = 0, dummyval = 0;
>  	u8 *cur_byte = NULL;
> -	struct join_bss_param *ptstrJoinBssParam;
> +	struct join_bss_param *j_bss_param;
I would choose either join_bss_param or bss_param for the name.

>  	struct host_if_drv *hif_drv = vif->hif_drv;
>  
>  	if (memcmp(attr->bssid, wilc_connected_ssid, ETH_ALEN) == 0) {
> @@ -918,8 +918,8 @@ static s32 Handle_Connect(struct wilc_vif *vif,
>  		return result;
>  	}
>  
> -	ptstrJoinBssParam = attr->params;
> -	if (!ptstrJoinBssParam) {
> +	j_bss_param = attr->params;
> +	if (!j_bss_param) {
>  		netdev_err(vif->ndev, "Required BSSID not found\n");
>  		result = -ENOENT;
>  		goto ERRORHANDLER;
> @@ -1027,8 +1027,8 @@ static s32 Handle_Connect(struct wilc_vif *vif,
>  		netdev_err(vif->ndev, "Channel out of range\n");
>  		*(cur_byte++) = 0xFF;
>  	}
> -	*(cur_byte++)  = (ptstrJoinBssParam->cap_info) & 0xFF;
> -	*(cur_byte++)  = ((ptstrJoinBssParam->cap_info) >> 8) & 0xFF;
> +	*(cur_byte++)  = (j_bss_param->cap_info) & 0xFF;
> +	*(cur_byte++)  = ((j_bss_param->cap_info) >> 8) & 0xFF;
>  
>  	if (attr->bssid)
>  		memcpy(cur_byte, attr->bssid, 6);
> @@ -1038,57 +1038,57 @@ static s32 Handle_Connect(struct wilc_vif *vif,
>  		memcpy(cur_byte, attr->bssid, 6);
>  	cur_byte += 6;
>  
> -	*(cur_byte++)  = (ptstrJoinBssParam->beacon_period) & 0xFF;
> -	*(cur_byte++)  = ((ptstrJoinBssParam->beacon_period) >> 8) & 0xFF;
> -	*(cur_byte++)  =  ptstrJoinBssParam->dtim_period;
> +	*(cur_byte++)  = (j_bss_param->beacon_period) & 0xFF;
> +	*(cur_byte++)  = ((j_bss_param->beacon_period) >> 8) & 0xFF;
> +	*(cur_byte++)  =  j_bss_param->dtim_period;
>  
> -	memcpy(cur_byte, ptstrJoinBssParam->supp_rates, MAX_RATES_SUPPORTED + 1);
> +	memcpy(cur_byte, j_bss_param->supp_rates, MAX_RATES_SUPPORTED + 1);
>  	cur_byte += (MAX_RATES_SUPPORTED + 1);
>  
> -	*(cur_byte++)  =  ptstrJoinBssParam->wmm_cap;
> -	*(cur_byte++)  = ptstrJoinBssParam->uapsd_cap;
> +	*(cur_byte++)  =  j_bss_param->wmm_cap;
> +	*(cur_byte++)  = j_bss_param->uapsd_cap;
>  
> -	*(cur_byte++)  = ptstrJoinBssParam->ht_capable;
> -	hif_drv->usr_conn_req.ht_capable = ptstrJoinBssParam->ht_capable;
> +	*(cur_byte++)  = j_bss_param->ht_capable;
> +	hif_drv->usr_conn_req.ht_capable = j_bss_param->ht_capable;
>  
> -	*(cur_byte++)  =  ptstrJoinBssParam->rsn_found;
> -	*(cur_byte++)  =  ptstrJoinBssParam->rsn_grp_policy;
> -	*(cur_byte++) =  ptstrJoinBssParam->mode_802_11i;
> +	*(cur_byte++)  =  j_bss_param->rsn_found;
> +	*(cur_byte++)  =  j_bss_param->rsn_grp_policy;
> +	*(cur_byte++) =  j_bss_param->mode_802_11i;
>  
> -	memcpy(cur_byte, ptstrJoinBssParam->rsn_pcip_policy, sizeof(ptstrJoinBssParam->rsn_pcip_policy));
> -	cur_byte += sizeof(ptstrJoinBssParam->rsn_pcip_policy);
> +	memcpy(cur_byte, j_bss_param->rsn_pcip_policy, sizeof(j_bss_param->rsn_pcip_policy));> +	cur_byte += sizeof(j_bss_param->rsn_pcip_policy);
>  
> -	memcpy(cur_byte, ptstrJoinBssParam->rsn_auth_policy, sizeof(ptstrJoinBssParam->rsn_auth_policy));
> -	cur_byte += sizeof(ptstrJoinBssParam->rsn_auth_policy);
> +	memcpy(cur_byte, j_bss_param->rsn_auth_policy, sizeof(j_bss_param->rsn_auth_policy));
> +	cur_byte += sizeof(j_bss_param->rsn_auth_policy);
>  
> -	memcpy(cur_byte, ptstrJoinBssParam->rsn_cap, sizeof(ptstrJoinBssParam->rsn_cap));
> -	cur_byte += sizeof(ptstrJoinBssParam->rsn_cap);
> +	memcpy(cur_byte, j_bss_param->rsn_cap, sizeof(j_bss_param->rsn_cap));
> +	cur_byte += sizeof(j_bss_param->rsn_cap);
>  
>  	*(cur_byte++) = REAL_JOIN_REQ;
> -	*(cur_byte++) = ptstrJoinBssParam->noa_enabled;
> +	*(cur_byte++) = j_bss_param->noa_enabled;
>  
> -	if (ptstrJoinBssParam->noa_enabled) {
> -		*(cur_byte++) = (ptstrJoinBssParam->tsf) & 0xFF;
> -		*(cur_byte++) = ((ptstrJoinBssParam->tsf) >> 8) & 0xFF;
> -		*(cur_byte++) = ((ptstrJoinBssParam->tsf) >> 16) & 0xFF;
> -		*(cur_byte++) = ((ptstrJoinBssParam->tsf) >> 24) & 0xFF;
> +	if (j_bss_param->noa_enabled) {
> +		*(cur_byte++) = (j_bss_param->tsf) & 0xFF;
> +		*(cur_byte++) = ((j_bss_param->tsf) >> 8) & 0xFF;
> +		*(cur_byte++) = ((j_bss_param->tsf) >> 16) & 0xFF;
> +		*(cur_byte++) = ((j_bss_param->tsf) >> 24) & 0xFF;
>  
> -		*(cur_byte++) = ptstrJoinBssParam->opp_enabled;
> -		*(cur_byte++) = ptstrJoinBssParam->idx;
> +		*(cur_byte++) = j_bss_param->opp_enabled;
> +		*(cur_byte++) = j_bss_param->idx;
>  
> -		if (ptstrJoinBssParam->opp_enabled)
> -			*(cur_byte++) = ptstrJoinBssParam->ct_window;
> +		if (j_bss_param->opp_enabled)
> +			*(cur_byte++) = j_bss_param->ct_window;
>  
> -		*(cur_byte++) = ptstrJoinBssParam->cnt;
> +		*(cur_byte++) = j_bss_param->cnt;
>  
> -		memcpy(cur_byte, ptstrJoinBssParam->duration, sizeof(ptstrJoinBssParam->duration));
> -		cur_byte += sizeof(ptstrJoinBssParam->duration);
> +		memcpy(cur_byte, j_bss_param->duration, sizeof(j_bss_param->duration));
> +		cur_byte += sizeof(j_bss_param->duration);
>  
> -		memcpy(cur_byte, ptstrJoinBssParam->interval, sizeof(ptstrJoinBssParam->interval));
> -		cur_byte += sizeof(ptstrJoinBssParam->interval);
> +		memcpy(cur_byte, j_bss_param->interval, sizeof(j_bss_param->interval));
> +		cur_byte += sizeof(j_bss_param->interval);
>  
> -		memcpy(cur_byte, ptstrJoinBssParam->start_time, sizeof(ptstrJoinBssParam->start_time));
> -		cur_byte += sizeof(ptstrJoinBssParam->start_time);
> +		memcpy(cur_byte, j_bss_param->start_time, sizeof(j_bss_param->start_time));
> +		cur_byte += sizeof(j_bss_param->start_time);
>  	}
>  
>  	cur_byte = wid_list[wid_cnt].val;
>
Ajay Singh Jan. 22, 2018, 7:29 a.m. UTC | #2 
On Fri, 19 Jan 2018 16:50:18 +0530
Claudiu Beznea - M18063 <Claudiu.Beznea@microchip.com> wrote:

> On 18.01.2018 15:17, Ajay Singh wrote:
> > fix "Avoid camelCase" issue reported by checkpatch.pl script.
> > 
> > Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
> > ---
> >  drivers/staging/wilc1000/host_interface.c | 78 +++++++++++++++----------------
> >  1 file changed, 39 insertions(+), 39 deletions(-)
> > 
> > diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
> > index 4ddd1a8..cc27b5a 100644
> > --- a/drivers/staging/wilc1000/host_interface.c
> > +++ b/drivers/staging/wilc1000/host_interface.c
> > @@ -909,7 +909,7 @@ static s32 Handle_Connect(struct wilc_vif *vif,
> >  	struct wid wid_list[8];
> >  	u32 wid_cnt = 0, dummyval = 0;
> >  	u8 *cur_byte = NULL;
> > -	struct join_bss_param *ptstrJoinBssParam;
> > +	struct join_bss_param *j_bss_param;  
> I would choose either join_bss_param or bss_param for the name.
> 
Claudiu, Thanks for the code review comments.
I will change j_bss_param to bss_param as per the comments.

> >  	struct host_if_drv *hif_drv = vif->hif_drv;
> >  
> >  	if (memcmp(attr->bssid, wilc_connected_ssid, ETH_ALEN) == 0) {
> > @@ -918,8 +918,8 @@ static s32 Handle_Connect(struct wilc_vif *vif,
> >  		return result;
> >  	}
> >  
> > -	ptstrJoinBssParam = attr->params;
> > -	if (!ptstrJoinBssParam) {
> > +	j_bss_param = attr->params;
> > +	if (!j_bss_param) {
> >  		netdev_err(vif->ndev, "Required BSSID not found\n");
> >  		result = -ENOENT;
> >  		goto ERRORHANDLER;
> > @@ -1027,8 +1027,8 @@ static s32 Handle_Connect(struct wilc_vif *vif,
> >  		netdev_err(vif->ndev, "Channel out of range\n");
> >  		*(cur_byte++) = 0xFF;
> >  	}
> > -	*(cur_byte++)  = (ptstrJoinBssParam->cap_info) & 0xFF;
> > -	*(cur_byte++)  = ((ptstrJoinBssParam->cap_info) >> 8) & 0xFF;
> > +	*(cur_byte++)  = (j_bss_param->cap_info) & 0xFF;
> > +	*(cur_byte++)  = ((j_bss_param->cap_info) >> 8) & 0xFF;
> >  
> >  	if (attr->bssid)
> >  		memcpy(cur_byte, attr->bssid, 6);
> > @@ -1038,57 +1038,57 @@ static s32 Handle_Connect(struct wilc_vif *vif,
> >  		memcpy(cur_byte, attr->bssid, 6);
> >  	cur_byte += 6;
> >  
> > -	*(cur_byte++)  = (ptstrJoinBssParam->beacon_period) & 0xFF;
> > -	*(cur_byte++)  = ((ptstrJoinBssParam->beacon_period) >> 8) & 0xFF;
> > -	*(cur_byte++)  =  ptstrJoinBssParam->dtim_period;
> > +	*(cur_byte++)  = (j_bss_param->beacon_period) & 0xFF;
> > +	*(cur_byte++)  = ((j_bss_param->beacon_period) >> 8) & 0xFF;
> > +	*(cur_byte++)  =  j_bss_param->dtim_period;
> >  
> > -	memcpy(cur_byte, ptstrJoinBssParam->supp_rates, MAX_RATES_SUPPORTED + 1);
> > +	memcpy(cur_byte, j_bss_param->supp_rates, MAX_RATES_SUPPORTED + 1);
> >  	cur_byte += (MAX_RATES_SUPPORTED + 1);
> >  
> > -	*(cur_byte++)  =  ptstrJoinBssParam->wmm_cap;
> > -	*(cur_byte++)  = ptstrJoinBssParam->uapsd_cap;
> > +	*(cur_byte++)  =  j_bss_param->wmm_cap;
> > +	*(cur_byte++)  = j_bss_param->uapsd_cap;
> >  
> > -	*(cur_byte++)  = ptstrJoinBssParam->ht_capable;
> > -	hif_drv->usr_conn_req.ht_capable = ptstrJoinBssParam->ht_capable;
> > +	*(cur_byte++)  = j_bss_param->ht_capable;
> > +	hif_drv->usr_conn_req.ht_capable = j_bss_param->ht_capable;
> >  
> > -	*(cur_byte++)  =  ptstrJoinBssParam->rsn_found;
> > -	*(cur_byte++)  =  ptstrJoinBssParam->rsn_grp_policy;
> > -	*(cur_byte++) =  ptstrJoinBssParam->mode_802_11i;
> > +	*(cur_byte++)  =  j_bss_param->rsn_found;
> > +	*(cur_byte++)  =  j_bss_param->rsn_grp_policy;
> > +	*(cur_byte++) =  j_bss_param->mode_802_11i;
> >  
> > -	memcpy(cur_byte, ptstrJoinBssParam->rsn_pcip_policy, sizeof(ptstrJoinBssParam->rsn_pcip_policy));
> > -	cur_byte += sizeof(ptstrJoinBssParam->rsn_pcip_policy);
> > +	memcpy(cur_byte, j_bss_param->rsn_pcip_policy, sizeof(j_bss_param->rsn_pcip_policy));> +	cur_byte += sizeof(j_bss_param->rsn_pcip_policy);
> >  
> > -	memcpy(cur_byte, ptstrJoinBssParam->rsn_auth_policy, sizeof(ptstrJoinBssParam->rsn_auth_policy));
> > -	cur_byte += sizeof(ptstrJoinBssParam->rsn_auth_policy);
> > +	memcpy(cur_byte, j_bss_param->rsn_auth_policy, sizeof(j_bss_param->rsn_auth_policy));
> > +	cur_byte += sizeof(j_bss_param->rsn_auth_policy);
> >  
> > -	memcpy(cur_byte, ptstrJoinBssParam->rsn_cap, sizeof(ptstrJoinBssParam->rsn_cap));
> > -	cur_byte += sizeof(ptstrJoinBssParam->rsn_cap);
> > +	memcpy(cur_byte, j_bss_param->rsn_cap, sizeof(j_bss_param->rsn_cap));
> > +	cur_byte += sizeof(j_bss_param->rsn_cap);
> >  
> >  	*(cur_byte++) = REAL_JOIN_REQ;
> > -	*(cur_byte++) = ptstrJoinBssParam->noa_enabled;
> > +	*(cur_byte++) = j_bss_param->noa_enabled;
> >  
> > -	if (ptstrJoinBssParam->noa_enabled) {
> > -		*(cur_byte++) = (ptstrJoinBssParam->tsf) & 0xFF;
> > -		*(cur_byte++) = ((ptstrJoinBssParam->tsf) >> 8) & 0xFF;
> > -		*(cur_byte++) = ((ptstrJoinBssParam->tsf) >> 16) & 0xFF;
> > -		*(cur_byte++) = ((ptstrJoinBssParam->tsf) >> 24) & 0xFF;
> > +	if (j_bss_param->noa_enabled) {
> > +		*(cur_byte++) = (j_bss_param->tsf) & 0xFF;
> > +		*(cur_byte++) = ((j_bss_param->tsf) >> 8) & 0xFF;
> > +		*(cur_byte++) = ((j_bss_param->tsf) >> 16) & 0xFF;
> > +		*(cur_byte++) = ((j_bss_param->tsf) >> 24) & 0xFF;
> >  
> > -		*(cur_byte++) = ptstrJoinBssParam->opp_enabled;
> > -		*(cur_byte++) = ptstrJoinBssParam->idx;
> > +		*(cur_byte++) = j_bss_param->opp_enabled;
> > +		*(cur_byte++) = j_bss_param->idx;
> >  
> > -		if (ptstrJoinBssParam->opp_enabled)
> > -			*(cur_byte++) = ptstrJoinBssParam->ct_window;
> > +		if (j_bss_param->opp_enabled)
> > +			*(cur_byte++) = j_bss_param->ct_window;
> >  
> > -		*(cur_byte++) = ptstrJoinBssParam->cnt;
> > +		*(cur_byte++) = j_bss_param->cnt;
> >  
> > -		memcpy(cur_byte, ptstrJoinBssParam->duration, sizeof(ptstrJoinBssParam->duration));
> > -		cur_byte += sizeof(ptstrJoinBssParam->duration);
> > +		memcpy(cur_byte, j_bss_param->duration, sizeof(j_bss_param->duration));
> > +		cur_byte += sizeof(j_bss_param->duration);
> >  
> > -		memcpy(cur_byte, ptstrJoinBssParam->interval, sizeof(ptstrJoinBssParam->interval));
> > -		cur_byte += sizeof(ptstrJoinBssParam->interval);
> > +		memcpy(cur_byte, j_bss_param->interval, sizeof(j_bss_param->interval));
> > +		cur_byte += sizeof(j_bss_param->interval);
> >  
> > -		memcpy(cur_byte, ptstrJoinBssParam->start_time, sizeof(ptstrJoinBssParam->start_time));
> > -		cur_byte += sizeof(ptstrJoinBssParam->start_time);
> > +		memcpy(cur_byte, j_bss_param->start_time, sizeof(j_bss_param->start_time));
> > +		cur_byte += sizeof(j_bss_param->start_time);
> >  	}
> >  
> >  	cur_byte = wid_list[wid_cnt].val;
> >
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 4ddd1a8..cc27b5a 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -909,7 +909,7 @@  static s32 Handle_Connect(struct wilc_vif *vif,
 	struct wid wid_list[8];
 	u32 wid_cnt = 0, dummyval = 0;
 	u8 *cur_byte = NULL;
-	struct join_bss_param *ptstrJoinBssParam;
+	struct join_bss_param *j_bss_param;
 	struct host_if_drv *hif_drv = vif->hif_drv;
 
 	if (memcmp(attr->bssid, wilc_connected_ssid, ETH_ALEN) == 0) {
@@ -918,8 +918,8 @@  static s32 Handle_Connect(struct wilc_vif *vif,
 		return result;
 	}
 
-	ptstrJoinBssParam = attr->params;
-	if (!ptstrJoinBssParam) {
+	j_bss_param = attr->params;
+	if (!j_bss_param) {
 		netdev_err(vif->ndev, "Required BSSID not found\n");
 		result = -ENOENT;
 		goto ERRORHANDLER;
@@ -1027,8 +1027,8 @@  static s32 Handle_Connect(struct wilc_vif *vif,
 		netdev_err(vif->ndev, "Channel out of range\n");
 		*(cur_byte++) = 0xFF;
 	}
-	*(cur_byte++)  = (ptstrJoinBssParam->cap_info) & 0xFF;
-	*(cur_byte++)  = ((ptstrJoinBssParam->cap_info) >> 8) & 0xFF;
+	*(cur_byte++)  = (j_bss_param->cap_info) & 0xFF;
+	*(cur_byte++)  = ((j_bss_param->cap_info) >> 8) & 0xFF;
 
 	if (attr->bssid)
 		memcpy(cur_byte, attr->bssid, 6);
@@ -1038,57 +1038,57 @@  static s32 Handle_Connect(struct wilc_vif *vif,
 		memcpy(cur_byte, attr->bssid, 6);
 	cur_byte += 6;
 
-	*(cur_byte++)  = (ptstrJoinBssParam->beacon_period) & 0xFF;
-	*(cur_byte++)  = ((ptstrJoinBssParam->beacon_period) >> 8) & 0xFF;
-	*(cur_byte++)  =  ptstrJoinBssParam->dtim_period;
+	*(cur_byte++)  = (j_bss_param->beacon_period) & 0xFF;
+	*(cur_byte++)  = ((j_bss_param->beacon_period) >> 8) & 0xFF;
+	*(cur_byte++)  =  j_bss_param->dtim_period;
 
-	memcpy(cur_byte, ptstrJoinBssParam->supp_rates, MAX_RATES_SUPPORTED + 1);
+	memcpy(cur_byte, j_bss_param->supp_rates, MAX_RATES_SUPPORTED + 1);
 	cur_byte += (MAX_RATES_SUPPORTED + 1);
 
-	*(cur_byte++)  =  ptstrJoinBssParam->wmm_cap;
-	*(cur_byte++)  = ptstrJoinBssParam->uapsd_cap;
+	*(cur_byte++)  =  j_bss_param->wmm_cap;
+	*(cur_byte++)  = j_bss_param->uapsd_cap;
 
-	*(cur_byte++)  = ptstrJoinBssParam->ht_capable;
-	hif_drv->usr_conn_req.ht_capable = ptstrJoinBssParam->ht_capable;
+	*(cur_byte++)  = j_bss_param->ht_capable;
+	hif_drv->usr_conn_req.ht_capable = j_bss_param->ht_capable;
 
-	*(cur_byte++)  =  ptstrJoinBssParam->rsn_found;
-	*(cur_byte++)  =  ptstrJoinBssParam->rsn_grp_policy;
-	*(cur_byte++) =  ptstrJoinBssParam->mode_802_11i;
+	*(cur_byte++)  =  j_bss_param->rsn_found;
+	*(cur_byte++)  =  j_bss_param->rsn_grp_policy;
+	*(cur_byte++) =  j_bss_param->mode_802_11i;
 
-	memcpy(cur_byte, ptstrJoinBssParam->rsn_pcip_policy, sizeof(ptstrJoinBssParam->rsn_pcip_policy));
-	cur_byte += sizeof(ptstrJoinBssParam->rsn_pcip_policy);
+	memcpy(cur_byte, j_bss_param->rsn_pcip_policy, sizeof(j_bss_param->rsn_pcip_policy));
+	cur_byte += sizeof(j_bss_param->rsn_pcip_policy);
 
-	memcpy(cur_byte, ptstrJoinBssParam->rsn_auth_policy, sizeof(ptstrJoinBssParam->rsn_auth_policy));
-	cur_byte += sizeof(ptstrJoinBssParam->rsn_auth_policy);
+	memcpy(cur_byte, j_bss_param->rsn_auth_policy, sizeof(j_bss_param->rsn_auth_policy));
+	cur_byte += sizeof(j_bss_param->rsn_auth_policy);
 
-	memcpy(cur_byte, ptstrJoinBssParam->rsn_cap, sizeof(ptstrJoinBssParam->rsn_cap));
-	cur_byte += sizeof(ptstrJoinBssParam->rsn_cap);
+	memcpy(cur_byte, j_bss_param->rsn_cap, sizeof(j_bss_param->rsn_cap));
+	cur_byte += sizeof(j_bss_param->rsn_cap);
 
 	*(cur_byte++) = REAL_JOIN_REQ;
-	*(cur_byte++) = ptstrJoinBssParam->noa_enabled;
+	*(cur_byte++) = j_bss_param->noa_enabled;
 
-	if (ptstrJoinBssParam->noa_enabled) {
-		*(cur_byte++) = (ptstrJoinBssParam->tsf) & 0xFF;
-		*(cur_byte++) = ((ptstrJoinBssParam->tsf) >> 8) & 0xFF;
-		*(cur_byte++) = ((ptstrJoinBssParam->tsf) >> 16) & 0xFF;
-		*(cur_byte++) = ((ptstrJoinBssParam->tsf) >> 24) & 0xFF;
+	if (j_bss_param->noa_enabled) {
+		*(cur_byte++) = (j_bss_param->tsf) & 0xFF;
+		*(cur_byte++) = ((j_bss_param->tsf) >> 8) & 0xFF;
+		*(cur_byte++) = ((j_bss_param->tsf) >> 16) & 0xFF;
+		*(cur_byte++) = ((j_bss_param->tsf) >> 24) & 0xFF;
 
-		*(cur_byte++) = ptstrJoinBssParam->opp_enabled;
-		*(cur_byte++) = ptstrJoinBssParam->idx;
+		*(cur_byte++) = j_bss_param->opp_enabled;
+		*(cur_byte++) = j_bss_param->idx;
 
-		if (ptstrJoinBssParam->opp_enabled)
-			*(cur_byte++) = ptstrJoinBssParam->ct_window;
+		if (j_bss_param->opp_enabled)
+			*(cur_byte++) = j_bss_param->ct_window;
 
-		*(cur_byte++) = ptstrJoinBssParam->cnt;
+		*(cur_byte++) = j_bss_param->cnt;
 
-		memcpy(cur_byte, ptstrJoinBssParam->duration, sizeof(ptstrJoinBssParam->duration));
-		cur_byte += sizeof(ptstrJoinBssParam->duration);
+		memcpy(cur_byte, j_bss_param->duration, sizeof(j_bss_param->duration));
+		cur_byte += sizeof(j_bss_param->duration);
 
-		memcpy(cur_byte, ptstrJoinBssParam->interval, sizeof(ptstrJoinBssParam->interval));
-		cur_byte += sizeof(ptstrJoinBssParam->interval);
+		memcpy(cur_byte, j_bss_param->interval, sizeof(j_bss_param->interval));
+		cur_byte += sizeof(j_bss_param->interval);
 
-		memcpy(cur_byte, ptstrJoinBssParam->start_time, sizeof(ptstrJoinBssParam->start_time));
-		cur_byte += sizeof(ptstrJoinBssParam->start_time);
+		memcpy(cur_byte, j_bss_param->start_time, sizeof(j_bss_param->start_time));
+		cur_byte += sizeof(j_bss_param->start_time);
 	}
 
 	cur_byte = wid_list[wid_cnt].val;