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

Commit 0e752df6 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wlcore: AP-mode - recover security seq num for stations 



Save the sequence number of the broadcast AP link in the wlvif. For each
connected station, save the sequence number in the drv_priv part of
ieee80211_sta. Use the saved numbers on recovery/resume, with the
obligatory increment on recovery.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 5a99610c

drivers/net/wireless/ti/wlcore/cmd.c

+7 −1
Original line number Diff line number Diff line
@@ -366,7 +366,9 @@ void wl12xx_free_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid) 
	wl1271_tx_reset_link_queues(wl, *hlid);

	wl->links[*hlid].wlvif = NULL;



	if (wlvif->bss_type != BSS_TYPE_AP_BSS) {

	if (wlvif->bss_type == BSS_TYPE_STA_BSS ||

	    (wlvif->bss_type == BSS_TYPE_AP_BSS &&

	     *hlid == wlvif->ap.bcast_hlid)) {

		/*

		 * save the total freed packets in the wlvif, in case this is

		 * recovery or suspend
@@ -635,6 +637,10 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	if (ret < 0)

		goto out_free_global;



	/* use the previous security seq, if this is a recovery/resume */

	wl->links[wlvif->ap.bcast_hlid].total_freed_pkts =

						wlvif->total_freed_pkts;



	cmd->role_id = wlvif->role_id;

	cmd->ap.aging_period = cpu_to_le16(wl->conf.tx.ap_aging_period);

	cmd->ap.bss_index = WL1271_AP_BSS_INDEX;

drivers/net/wireless/ti/wlcore/main.c

+28 −0
Original line number Diff line number Diff line
@@ -4505,6 +4505,9 @@ static int wl1271_allocate_sta(struct wl1271 *wl, 
		return -EBUSY;

	}



	/* use the previous security seq, if this is a recovery/resume */

	wl->links[wl_sta->hlid].total_freed_pkts = wl_sta->total_freed_pkts;



	set_bit(wl_sta->hlid, wlvif->ap.sta_hlid_map);

	memcpy(wl->links[wl_sta->hlid].addr, sta->addr, ETH_ALEN);

	wl->active_sta_count++;
@@ -4513,12 +4516,37 @@ static int wl1271_allocate_sta(struct wl1271 *wl, 


void wl1271_free_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid)

{

	struct wl1271_station *wl_sta;

	struct ieee80211_sta *sta;

	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);



	if (!test_bit(hlid, wlvif->ap.sta_hlid_map))

		return;



	clear_bit(hlid, wlvif->ap.sta_hlid_map);

	__clear_bit(hlid, &wl->ap_ps_map);

	__clear_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map);



	/*

	 * save the last used PN in the private part of iee80211_sta,

	 * in case of recovery/suspend

	 */

	rcu_read_lock();

	sta = ieee80211_find_sta(vif, wl->links[hlid].addr);

	if (sta) {

		wl_sta = (void *)sta->drv_priv;

		wl_sta->total_freed_pkts = wl->links[hlid].total_freed_pkts;



		/*

		 * increment the initial seq number on recovery to account for

		 * transmitted packets that we haven't yet got in the FW status

		 */

		if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags))

			wl_sta->total_freed_pkts +=

					WL1271_TX_SQN_POST_RECOVERY_PADDING;

	}

	rcu_read_unlock();



	wl12xx_free_link(wl, wlvif, &hlid);

	wl->active_sta_count--;

drivers/net/wireless/ti/wlcore/wlcore_i.h

+9 −0
Original line number Diff line number Diff line
@@ -325,6 +325,13 @@ struct wl12xx_rx_filter { 
struct wl1271_station {

	u8 hlid;

	bool in_connection;



	/*

	 * total freed FW packets on the link to the STA - used for tracking the

	 * AES/TKIP PN across recoveries. Re-initialized each time from the

	 * wl1271_station structure.

	 */

	u64 total_freed_pkts;

};



struct wl12xx_vif {
@@ -461,6 +468,8 @@ struct wl12xx_vif { 
		 * total freed FW packets on the link - used for

		 * storing the AES/TKIP PN during recovery, as this

		 * structure is not zeroed out.

		 * For STA this holds the PN of the link to the AP.

		 * For AP this holds the PN of the broadcast link.

		 */

		u64 total_freed_pkts;

	};