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

Commit 990bd915 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by Kalle Valo
Browse files

ath6kl: Maintain virtual interface in a list 



This patch removes all references to ar->vif and takes
vif from a list.

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

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

+41 −25
Original line number Diff line number Diff line
@@ -228,9 +228,9 @@ static void ath6kl_set_key_mgmt(struct ath6kl_vif *vif, u32 key_mgmt) 
	}

}



static bool ath6kl_cfg80211_ready(struct ath6kl *ar)

static bool ath6kl_cfg80211_ready(struct ath6kl_vif *vif)

{

	struct ath6kl_vif *vif = ar->vif;

	struct ath6kl *ar = vif->ar;



	if (!test_bit(WMI_READY, &ar->flag)) {

		ath6kl_err("wmi is not ready\n");
@@ -302,7 +302,7 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 


	vif->sme_state = SME_CONNECTING;



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (test_bit(DESTROY_IN_PROGRESS, &ar->flag)) {
@@ -614,7 +614,7 @@ static int ath6kl_cfg80211_disconnect(struct wiphy *wiphy, 
	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: reason=%u\n", __func__,

		   reason_code);



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (test_bit(DESTROY_IN_PROGRESS, &ar->flag)) {
@@ -713,7 +713,7 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, 
	int ret = 0;

	u32 force_fg_scan = 0;



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (!ar->usr_bss_filter) {
@@ -831,7 +831,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, 
	u8 key_type;

	int status = 0;



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (params->cipher == CCKM_KRK_CIPHER_SUITE) {
@@ -953,7 +953,7 @@ static int ath6kl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, 


	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: index %d\n", __func__, key_index);



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (key_index < WMI_MIN_KEY_INDEX || key_index > WMI_MAX_KEY_INDEX) {
@@ -980,14 +980,13 @@ static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, 
				   void (*callback) (void *cookie,

						     struct key_params *))

{

	struct ath6kl *ar = (struct ath6kl *)ath6kl_priv(ndev);

	struct ath6kl_vif *vif = netdev_priv(ndev);

	struct ath6kl_key *key = NULL;

	struct key_params params;



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: index %d\n", __func__, key_index);



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (key_index < WMI_MIN_KEY_INDEX || key_index > WMI_MAX_KEY_INDEX) {
@@ -1024,7 +1023,7 @@ static int ath6kl_cfg80211_set_default_key(struct wiphy *wiphy, 


	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: index %d\n", __func__, key_index);



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (key_index < WMI_MIN_KEY_INDEX || key_index > WMI_MAX_KEY_INDEX) {
@@ -1080,12 +1079,17 @@ void ath6kl_cfg80211_tkip_micerr_event(struct ath6kl_vif *vif, u8 keyid, 
static int ath6kl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)

{

	struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);

	struct ath6kl_vif *vif;

	int ret;



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: changed 0x%x\n", __func__,

		   changed);



	if (!ath6kl_cfg80211_ready(ar))

	vif = ath6kl_vif_first(ar);

	if (!vif)

		return -EIO;



	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (changed & WIPHY_PARAM_RTS_THRESHOLD) {
@@ -1108,12 +1112,17 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy, 
				       int dbm)

{

	struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);

	struct ath6kl_vif *vif;

	u8 ath6kl_dbm;



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type 0x%x, dbm %d\n", __func__,

		   type, dbm);



	if (!ath6kl_cfg80211_ready(ar))

	vif = ath6kl_vif_first(ar);

	if (!vif)

		return -EIO;



	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	switch (type) {
@@ -1128,7 +1137,7 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy, 
		return -EOPNOTSUPP;

	}



	ath6kl_wmi_set_tx_pwr_cmd(ar->wmi, ath6kl_dbm);

	ath6kl_wmi_set_tx_pwr_cmd(ar->wmi, vif->fw_vif_idx, ath6kl_dbm);



	return 0;

}
@@ -1136,15 +1145,19 @@ static int ath6kl_cfg80211_set_txpower(struct wiphy *wiphy, 
static int ath6kl_cfg80211_get_txpower(struct wiphy *wiphy, int *dbm)

{

	struct ath6kl *ar = (struct ath6kl *)wiphy_priv(wiphy);

	struct ath6kl_vif *vif = ar->vif;

	struct ath6kl_vif *vif;



	vif = ath6kl_vif_first(ar);

	if (!vif)

		return -EIO;



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (test_bit(CONNECTED, &vif->flags)) {

		ar->tx_pwr = 0;



		if (ath6kl_wmi_get_tx_pwr_cmd(ar->wmi) != 0) {

		if (ath6kl_wmi_get_tx_pwr_cmd(ar->wmi, vif->fw_vif_idx) != 0) {

			ath6kl_err("ath6kl_wmi_get_tx_pwr_cmd failed\n");

			return -EIO;

		}
@@ -1173,7 +1186,7 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy, 
	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: pmgmt %d, timeout %d\n",

		   __func__, pmgmt, timeout);



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (pmgmt) {
@@ -1204,7 +1217,7 @@ static int ath6kl_cfg80211_change_iface(struct wiphy *wiphy, 


	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: type %u\n", __func__, type);



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	switch (type) {
@@ -1241,7 +1254,7 @@ static int ath6kl_cfg80211_join_ibss(struct wiphy *wiphy, 
	struct ath6kl_vif *vif = netdev_priv(dev);

	int status;



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	vif->ssid_len = ibss_param->ssid_len;
@@ -1306,10 +1319,9 @@ static int ath6kl_cfg80211_join_ibss(struct wiphy *wiphy, 
static int ath6kl_cfg80211_leave_ibss(struct wiphy *wiphy,

				      struct net_device *dev)

{

	struct ath6kl *ar = (struct ath6kl *)ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	ath6kl_disconnect(vif);
@@ -1539,10 +1551,9 @@ static int ath6kl_set_channel(struct wiphy *wiphy, struct net_device *dev, 
			      struct ieee80211_channel *chan,

			      enum nl80211_channel_type channel_type)

{

	struct ath6kl *ar = ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: center_freq=%u hw_value=%u\n",
@@ -1609,7 +1620,7 @@ static int ath6kl_ap_beacon(struct wiphy *wiphy, struct net_device *dev, 


	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: add=%d\n", __func__, add);



	if (!ath6kl_cfg80211_ready(ar))

	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	if (vif->next_mode != AP_NETWORK)
@@ -1991,11 +2002,13 @@ struct ath6kl *ath6kl_core_alloc(struct device *dev) 


	spin_lock_init(&ar->lock);

	spin_lock_init(&ar->mcastpsq_lock);

	spin_lock_init(&ar->list_lock);



	init_waitqueue_head(&ar->event_wq);

	sema_init(&ar->sem, 1);



	INIT_LIST_HEAD(&ar->amsdu_rx_buffer_queue);

	INIT_LIST_HEAD(&ar->vif_list);



	clear_bit(WMI_ENABLED, &ar->flag);

	clear_bit(SKIP_SCAN, &ar->flag);
@@ -2110,7 +2123,6 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name, 
	ndev->ieee80211_ptr = &vif->wdev;

	vif->wdev.wiphy = ar->wiphy;

	vif->ar = ar;

	ar->vif = vif;

	vif->ndev = ndev;

	SET_NETDEV_DEV(ndev, wiphy_dev(vif->wdev.wiphy));

	vif->wdev.netdev = ndev;
@@ -2134,6 +2146,10 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name, 
	ar->wlan_pwr_state = WLAN_POWER_STATE_ON;

	set_bit(NETDEV_REGISTERED, &vif->flags);



	spin_lock(&ar->list_lock);

	list_add_tail(&vif->list, &ar->vif_list);

	spin_unlock(&ar->list_lock);



	return ndev;



err:

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

+5 −1
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ enum ath6kl_vif_state { 
};



struct ath6kl_vif {

	struct list_head list;

	struct wireless_dev wdev;

	struct net_device *ndev;

	struct ath6kl *ar;
@@ -456,7 +457,9 @@ struct ath6kl { 
	int total_tx_data_pend;

	struct htc_target *htc_target;

	void *hif_priv;

	struct ath6kl_vif *vif;

	struct list_head vif_list;

	/* Lock to avoid race in vif_list entries among add/del/traverse */

	spinlock_t list_lock;

	spinlock_t lock;

	struct semaphore sem;

	u16 listen_intvl_b;
@@ -662,4 +665,5 @@ void ath6kl_reset_device(struct ath6kl *ar, u32 target_type, 
void ath6kl_init_control_info(struct ath6kl_vif *vif);

void ath6kl_deinit_if_data(struct ath6kl_vif *vif);

void ath6kl_core_free(struct ath6kl *ar);

struct ath6kl_vif *ath6kl_vif_first(struct ath6kl *ar);

#endif /* CORE_H */

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

+18 −7
Original line number Diff line number Diff line
@@ -397,15 +397,20 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf, 
				   size_t count, loff_t *ppos)

{

	struct ath6kl *ar = file->private_data;

	/* TODO: Findout vif */

	struct ath6kl_vif *vif = ar->vif;

	struct target_stats *tgt_stats = &vif->target_stats;

	struct ath6kl_vif *vif;

	struct target_stats *tgt_stats;

	char *buf;

	unsigned int len = 0, buf_len = 1500;

	int i;

	long left;

	ssize_t ret_cnt;



	vif = ath6kl_vif_first(ar);

	if (!vif)

		return -EIO;



	tgt_stats = &vif->target_stats;



	buf = kzalloc(buf_len, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;
@@ -1249,8 +1254,7 @@ static ssize_t ath6kl_create_qos_write(struct file *file, 
{



	struct ath6kl *ar = file->private_data;

	/* TODO: Findout vif */

	struct ath6kl_vif *vif = ar->vif;

	struct ath6kl_vif *vif;

	char buf[100];

	ssize_t len;

	char *sptr, *token;
@@ -1258,6 +1262,10 @@ static ssize_t ath6kl_create_qos_write(struct file *file, 
	u32 val32;

	u16 val16;



	vif = ath6kl_vif_first(ar);

	if (!vif)

		return -EIO;



	len = min(count, sizeof(buf) - 1);

	if (copy_from_user(buf, user_buf, len))

		return -EFAULT;
@@ -1423,14 +1431,17 @@ static ssize_t ath6kl_delete_qos_write(struct file *file, 
{



	struct ath6kl *ar = file->private_data;

	/* TODO: Findout vif */

	struct ath6kl_vif *vif = ar->vif;

	struct ath6kl_vif *vif;

	char buf[100];

	ssize_t len;

	char *sptr, *token;

	u8 traffic_class;

	u8 tsid;



	vif = ath6kl_vif_first(ar);

	if (!vif)

		return -EIO;



	len = min(count, sizeof(buf) - 1);

	if (copy_from_user(buf, user_buf, len))

		return -EFAULT;

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

+9 −6
Original line number Diff line number Diff line
@@ -1628,11 +1628,7 @@ static void ath6kl_cleanup_vif(struct ath6kl_vif *vif, bool wmi_ready) 


void ath6kl_stop_txrx(struct ath6kl *ar)

{

	struct ath6kl_vif *vif = ar->vif;

	struct net_device *ndev = vif->ndev;



	if (!ndev)

		return;

	struct ath6kl_vif *vif, *tmp_vif;



	set_bit(DESTROY_IN_PROGRESS, &ar->flag);
@@ -1641,7 +1637,14 @@ void ath6kl_stop_txrx(struct ath6kl *ar) 
		return;

	}



	ath6kl_cleanup_vif(ar->vif, test_bit(WMI_READY, &ar->flag));

	spin_lock(&ar->list_lock);

	list_for_each_entry_safe(vif, tmp_vif, &ar->vif_list, list) {

		list_del(&vif->list);

		spin_unlock(&ar->list_lock);

		ath6kl_cleanup_vif(vif, test_bit(WMI_READY, &ar->flag));

		spin_lock(&ar->list_lock);

	}

	spin_unlock(&ar->list_lock);



	clear_bit(WMI_READY, &ar->flag);

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

+30 −2
Original line number Diff line number Diff line
@@ -861,8 +861,19 @@ void ath6kl_disconnect(struct ath6kl_vif *vif) 


void ath6kl_deep_sleep_enable(struct ath6kl *ar)

{

	/* TODO: Pass vif instead of taking it from ar */

	struct ath6kl_vif *vif = ar->vif;

	struct ath6kl_vif *vif;



	/* FIXME: for multi vif */

	vif = ath6kl_vif_first(ar);

	if (!vif) {

		/* save the current power mode before enabling power save */

		ar->wmi->saved_pwr_mode = ar->wmi->pwr_mode;



		if (ath6kl_wmi_powermode_cmd(ar->wmi, 0, REC_POWER) != 0)

			ath6kl_warn("ath6kl_deep_sleep_enable: "

				    "wmi_powermode_cmd failed\n");

		return;

	}



	switch (vif->sme_state) {

	case SME_CONNECTING:
@@ -1363,6 +1374,23 @@ void ath6kl_disconnect_event(struct ath6kl_vif *vif, u8 reason, u8 *bssid, 
	ath6kl_tx_data_cleanup(ar);

}



struct ath6kl_vif *ath6kl_vif_first(struct ath6kl *ar)

{

	struct ath6kl_vif *vif;



	spin_lock(&ar->list_lock);

	if (list_empty(&ar->vif_list)) {

		spin_unlock(&ar->list_lock);

		return NULL;

	}



	vif = list_first_entry(&ar->vif_list, struct ath6kl_vif, list);



	spin_unlock(&ar->list_lock);



	return vif;

}



static int ath6kl_open(struct net_device *dev)

{

	struct ath6kl_vif *vif = netdev_priv(dev);