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

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

ath6kl: Move disconnect timer to vif structure 



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

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

+4 −5
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 
	if ((!(ar->connect_ctrl_flags & CONNECT_DO_WPA_OFFLOAD)) &&

	    ((vif->auth_mode == WPA_PSK_AUTH)

	     || (vif->auth_mode == WPA2_PSK_AUTH))) {

		mod_timer(&ar->disconnect_timer,

		mod_timer(&vif->disconnect_timer,

			  jiffies + msecs_to_jiffies(DISCON_TIMER_INTVAL));

	}
@@ -897,7 +897,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, 
	if (((vif->auth_mode == WPA_PSK_AUTH)

	     || (vif->auth_mode == WPA2_PSK_AUTH))

	    && (key_usage & GROUP_USAGE))

		del_timer(&ar->disconnect_timer);

		del_timer(&vif->disconnect_timer);



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,

		   "%s: index %d, key_len %d, key_type 0x%x, key_usage 0x%x, seq_len %d\n",
@@ -2062,16 +2062,15 @@ int ath6kl_register_ieee80211_hw(struct ath6kl *ar) 


static int ath6kl_init_if_data(struct ath6kl_vif *vif)

{

	struct ath6kl *ar = vif->ar;



	vif->aggr_cntxt = aggr_init(vif->ndev);

	if (!vif->aggr_cntxt) {

		ath6kl_err("failed to initialize aggr\n");

		return -ENOMEM;

	}



	setup_timer(&ar->disconnect_timer, disconnect_timer_handler,

	setup_timer(&vif->disconnect_timer, disconnect_timer_handler,

		    (unsigned long) vif->ndev);

	set_bit(WMM_ENABLED, &vif->flags);



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ struct ath6kl_vif { 
	struct ath6kl_wep_key wep_key_list[WMI_MAX_KEY_INDEX + 1];

	struct ath6kl_key keys[WMI_MAX_KEY_INDEX + 1];

	struct aggr_info *aggr_cntxt;

	struct timer_list disconnect_timer;

};



/* Flag info */
@@ -477,7 +478,6 @@ struct ath6kl { 
	struct wmi_ap_mode_stat ap_stats;

	u8 ap_country_code[3];

	struct list_head amsdu_rx_buffer_queue;

	struct timer_list disconnect_timer;

	u8 rx_meta_ver;

	struct wireless_dev *wdev;

	struct cfg80211_scan_request *scan_req;

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

+2 −2
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ void ath6kl_stop_endpoint(struct net_device *dev, bool keep_profile, 
		if (!keep_profile)

			ath6kl_init_profile_info(ar);



		del_timer(&ar->disconnect_timer);

		del_timer(&vif->disconnect_timer);



		clear_bit(WMI_READY, &ar->flag);

		ath6kl_wmi_shutdown(ar->wmi);
@@ -1396,7 +1396,7 @@ void ath6kl_disconnect_event(struct ath6kl *ar, u8 reason, u8 *bssid, 


	aggr_reset_state(vif->aggr_cntxt);



	del_timer(&ar->disconnect_timer);

	del_timer(&vif->disconnect_timer);



	ath6kl_dbg(ATH6KL_DBG_WLAN_CONNECT,

		   "disconnect reason is %d\n", reason);