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

Commit 712e9bf7 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wl12xx: fix session counter 



Increment the session counter on every
wl12xx_cmd_role_start_sta() command.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 3be4112c

drivers/net/wireless/wl12xx/cmd.c

+11 −1
Original line number Diff line number Diff line
@@ -458,6 +458,16 @@ static void wl12xx_free_link(struct wl1271 *wl, u8 *hlid) 
	*hlid = WL12XX_INVALID_LINK_ID;

}



static int wl12xx_get_new_session_id(struct wl1271 *wl)

{

	if (wl->session_counter >= SESSION_COUNTER_MAX)

		wl->session_counter = 0;



	wl->session_counter++;



	return wl->session_counter;

}



int wl12xx_cmd_role_start_dev(struct wl1271 *wl)

{

	struct wl12xx_cmd_role_start *cmd;
@@ -580,7 +590,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl) 
			goto out_free;

	}

	cmd->sta.hlid = wl->sta_hlid;

	cmd->sta.session = wl->session_counter;

	cmd->sta.session = wl12xx_get_new_session_id(wl);

	cmd->sta.remote_rates = cpu_to_le32(wl->rate_set);



	wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "

drivers/net/wireless/wl12xx/main.c

+1 −5
Original line number Diff line number Diff line
@@ -2187,11 +2187,6 @@ static int wl1271_sta_handle_idle(struct wl1271 *wl, bool idle) 
			goto out;

		set_bit(WL1271_FLAG_IDLE, &wl->flags);

	} else {

		/* increment the session counter */

		wl->session_counter++;

		if (wl->session_counter >= SESSION_COUNTER_MAX)

			wl->session_counter = 0;



		/* The current firmware only supports sched_scan in idle */

		if (wl->sched_scanning) {

			wl1271_scan_sched_scan_stop(wl);
@@ -4453,6 +4448,7 @@ struct ieee80211_hw *wl1271_alloc_hw(void) 
	wl->sta_hlid = WL12XX_INVALID_LINK_ID;

	wl->dev_role_id = WL12XX_INVALID_ROLE_ID;

	wl->dev_hlid = WL12XX_INVALID_LINK_ID;

	wl->session_counter = 0;

	setup_timer(&wl->rx_streaming_timer, wl1271_rx_streaming_timer,

		    (unsigned long) wl);

	wl->fwlog_size = 0;