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

Commit 551959d8 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by Kalle Valo
Browse files

ath6kl: Use appropriate wdev from vif 



Remove the wdev reference in struct ath6kl.

Signed-off-by: default avatarVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 0ce59445

drivers/net/wireless/ath/ath6kl/cfg80211.c

+7 −10
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel, 
	clear_bit(DTIM_PERIOD_AVAIL, &vif->flags);



	if (nw_type & ADHOC_NETWORK) {

		if (ar->wdev->iftype != NL80211_IFTYPE_ADHOC) {

		if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC) {

			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,

				   "%s: ath6k not in ibss mode\n", __func__);

			return;
@@ -630,8 +630,8 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel, 
	}



	if (nw_type & INFRA_NETWORK) {

		if (ar->wdev->iftype != NL80211_IFTYPE_STATION &&

		    ar->wdev->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		if (vif->wdev.iftype != NL80211_IFTYPE_STATION &&

		    vif->wdev.iftype != NL80211_IFTYPE_P2P_CLIENT) {

			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,

				   "%s: ath6k not in station mode\n", __func__);

			return;
@@ -717,7 +717,7 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason, 
	}



	if (vif->nw_type & ADHOC_NETWORK) {

		if (ar->wdev->iftype != NL80211_IFTYPE_ADHOC) {

		if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC) {

			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,

				   "%s: ath6k not in ibss mode\n", __func__);

			return;
@@ -728,8 +728,8 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason, 
	}



	if (vif->nw_type & INFRA_NETWORK) {

		if (ar->wdev->iftype != NL80211_IFTYPE_STATION &&

		    ar->wdev->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		if (vif->wdev.iftype != NL80211_IFTYPE_STATION &&

		    vif->wdev.iftype != NL80211_IFTYPE_P2P_CLIENT) {

			ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,

				   "%s: ath6k not in station mode\n", __func__);

			return;
@@ -1320,8 +1320,6 @@ static int ath6kl_cfg80211_change_iface(struct wiphy *wiphy, 
					enum nl80211_iftype type, u32 *flags,

					struct vif_params *params)

{

	struct ath6kl *ar = ath6kl_priv(ndev);

	struct wireless_dev *wdev = ar->wdev;

	struct ath6kl_vif *vif = netdev_priv(ndev);



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type %u\n", __func__, type);
@@ -1350,7 +1348,7 @@ static int ath6kl_cfg80211_change_iface(struct wiphy *wiphy, 
		return -EOPNOTSUPP;

	}



	wdev->iftype = type;

	vif->wdev.iftype = type;



	return 0;

}
@@ -2252,7 +2250,6 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name, 
	vif->wdev.iftype = type;

	vif->fw_vif_idx = fw_vif_idx;

	vif->nw_type = vif->next_mode = nw_type;

	ar->wdev = &vif->wdev;



	memcpy(ndev->dev_addr, ar->mac_addr, ETH_ALEN);

	if (fw_vif_idx != 0)

drivers/net/wireless/ath/ath6kl/core.h

+0 −1
Original line number Diff line number Diff line
@@ -498,7 +498,6 @@ struct ath6kl { 
	u8 ap_country_code[3];

	struct list_head amsdu_rx_buffer_queue;

	u8 rx_meta_ver;

	struct wireless_dev *wdev;

	enum wlan_low_pwr_state wlan_pwr_state;

	struct wmi_scan_params_cmd sc_params;

	u8 mac_addr[ETH_ALEN];