Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 657a49be authored by Pontus Fuchs's avatar Pontus Fuchs Committed by Kalle Valo
Browse files

wcn36xx: Use consistent name for private vif 



Some code used priv_vif and some used vif_priv. Convert all to vif_priv
for consistency.

Signed-off-by: default avatarPontus Fuchs <pontus.fuchs@gmail.com>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent ce75877f

drivers/net/wireless/ath/wcn36xx/smd.c

+14 −14
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void wcn36xx_smd_set_sta_params(struct wcn36xx *wcn, 
		struct ieee80211_sta *sta,

		struct wcn36xx_hal_config_sta_params *sta_params)

{

	struct wcn36xx_vif *priv_vif = wcn36xx_vif_to_priv(vif);

	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);

	struct wcn36xx_sta *priv_sta = NULL;

	if (vif->type == NL80211_IFTYPE_ADHOC ||

	    vif->type == NL80211_IFTYPE_AP ||
@@ -215,7 +215,7 @@ static void wcn36xx_smd_set_sta_params(struct wcn36xx *wcn, 
	else

		memcpy(&sta_params->bssid, vif->addr, ETH_ALEN);



	sta_params->encrypt_type = priv_vif->encrypt_type;

	sta_params->encrypt_type = vif_priv->encrypt_type;

	sta_params->short_preamble_supported = true;



	sta_params->rifs_mode = 0;
@@ -224,7 +224,7 @@ static void wcn36xx_smd_set_sta_params(struct wcn36xx *wcn, 
	sta_params->uapsd = 0;

	sta_params->mimo_ps = WCN36XX_HAL_HT_MIMO_PS_STATIC;

	sta_params->max_ampdu_duration = 0;

	sta_params->bssid_index = priv_vif->bss_index;

	sta_params->bssid_index = vif_priv->bss_index;

	sta_params->p2p = 0;



	if (sta) {
@@ -726,7 +726,7 @@ static int wcn36xx_smd_add_sta_self_rsp(struct wcn36xx *wcn, 
					size_t len)

{

	struct wcn36xx_hal_add_sta_self_rsp_msg *rsp;

	struct wcn36xx_vif *priv_vif = wcn36xx_vif_to_priv(vif);

	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);



	if (len < sizeof(*rsp))

		return -EINVAL;
@@ -743,8 +743,8 @@ static int wcn36xx_smd_add_sta_self_rsp(struct wcn36xx *wcn, 
		    "hal add sta self status %d self_sta_index %d dpu_index %d\n",

		    rsp->status, rsp->self_sta_index, rsp->dpu_index);



	priv_vif->self_sta_index = rsp->self_sta_index;

	priv_vif->self_dpu_desc_index = rsp->dpu_index;

	vif_priv->self_sta_index = rsp->self_sta_index;

	vif_priv->self_dpu_desc_index = rsp->dpu_index;



	return 0;

}
@@ -1175,7 +1175,7 @@ static int wcn36xx_smd_config_bss_rsp(struct wcn36xx *wcn, 
{

	struct wcn36xx_hal_config_bss_rsp_msg *rsp;

	struct wcn36xx_hal_config_bss_rsp_params *params;

	struct wcn36xx_vif *priv_vif = wcn36xx_vif_to_priv(vif);

	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);



	if (len < sizeof(*rsp))

		return -EINVAL;
@@ -1198,14 +1198,14 @@ static int wcn36xx_smd_config_bss_rsp(struct wcn36xx *wcn, 
		    params->bss_bcast_sta_idx, params->mac,

		    params->tx_mgmt_power, params->ucast_dpu_signature);



	priv_vif->bss_index = params->bss_index;

	vif_priv->bss_index = params->bss_index;



	if (priv_vif->sta) {

		priv_vif->sta->bss_sta_index =  params->bss_sta_index;

		priv_vif->sta->bss_dpu_desc_index = params->dpu_desc_index;

	if (vif_priv->sta) {

		vif_priv->sta->bss_sta_index =  params->bss_sta_index;

		vif_priv->sta->bss_dpu_desc_index = params->dpu_desc_index;

	}



	priv_vif->self_ucast_dpu_sign = params->ucast_dpu_signature;

	vif_priv->self_ucast_dpu_sign = params->ucast_dpu_signature;



	return 0;

}
@@ -1343,13 +1343,13 @@ int wcn36xx_smd_config_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif, 
int wcn36xx_smd_delete_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif)

{

	struct wcn36xx_hal_delete_bss_req_msg msg_body;

	struct wcn36xx_vif *priv_vif = wcn36xx_vif_to_priv(vif);

	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);

	int ret = 0;



	mutex_lock(&wcn->hal_mutex);

	INIT_HAL_MSG(msg_body, WCN36XX_HAL_DELETE_BSS_REQ);



	msg_body.bss_index = priv_vif->bss_index;

	msg_body.bss_index = vif_priv->bss_index;



	PREPARE_HAL_BUF(wcn->hal_buf, msg_body);