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

Commit db81956c authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

wl1271: Prevent dropping of TX frames in joins 



The wl1271 uses a session counter in CMD_JOIN and TX frame descriptors. This
counter is used to determine which frames to drop when the CMD_JOIN is
executed.

The driver executes CMD_JOIN multiple times upon association and sometimes
disassociation, and we don't want any frames to get lost.

Fix this by incrementing the session counter only when leaving idle (not every
CMD_JOIN as before.) Also, remove the TX flush flag from the CMD_JOIN options.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 43163f0f

drivers/net/wireless/wl12xx/wl1271_cmd.c

+0 −6
Original line number Diff line number Diff line
@@ -336,12 +336,6 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type) 
	join->channel = wl->channel;

	join->ssid_len = wl->ssid_len;

	memcpy(join->ssid, wl->ssid, wl->ssid_len);

	join->ctrl = WL1271_JOIN_CMD_CTRL_TX_FLUSH;



	/* increment the session counter */

	wl->session_counter++;

	if (wl->session_counter >= SESSION_COUNTER_MAX)

		wl->session_counter = 0;



	join->ctrl |= wl->session_counter << WL1271_JOIN_CMD_TX_SESSION_OFFSET;

drivers/net/wireless/wl12xx/wl1271_main.c

+5 −0
Original line number Diff line number Diff line
@@ -1135,6 +1135,11 @@ static int wl1271_dummy_join(struct wl1271 *wl) 


	memcpy(wl->bssid, dummy_bssid, ETH_ALEN);



	/* increment the session counter */

	wl->session_counter++;

	if (wl->session_counter >= SESSION_COUNTER_MAX)

		wl->session_counter = 0;



	/* pass through frames from all BSS */

	wl1271_configure_filters(wl, FIF_OTHER_BSS);