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

Commit 0b70078c authored by Eyal Shapira's avatar Eyal Shapira Committed by Luciano Coelho
Browse files

wlcore: support scan reports during periodic scan 



FW API changed and now PERIODIC_SCAN_REPORT_EVENT is sent
in case results were found at the end of each sched scan
cycle. Previous FW was missing that and broke sched scan.

This API change is available from 18xx FW 8.5.0.0.27

[Arik - move changes to 18xx specific files, align FW structures to
latest for scan command]

Signed-off-by: default avatarEyal Shapira <eyal@wizery.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent c80daad6

drivers/net/wireless/ti/wl12xx/event.c

+7 −3
Original line number Diff line number Diff line
@@ -64,10 +64,14 @@ int wl12xx_process_mailbox_events(struct wl1271 *wl) 
			wl12xx_scan_completed(wl, wl->scan_wlvif);

	}



	if (vector & PERIODIC_SCAN_REPORT_EVENT_ID)

		wlcore_event_sched_scan_report(wl,

	if (vector & PERIODIC_SCAN_REPORT_EVENT_ID) {

		wl1271_debug(DEBUG_EVENT,

			     "PERIODIC_SCAN_REPORT_EVENT (status 0x%0x)",

			     mbox->scheduled_scan_status);



		wlcore_scan_sched_scan_results(wl);

	}



	if (vector & PERIODIC_SCAN_COMPLETE_EVENT_ID)

		wlcore_event_sched_scan_completed(wl,

						  mbox->scheduled_scan_status);

drivers/net/wireless/ti/wl18xx/event.c

+8 −0
Original line number Diff line number Diff line
@@ -61,6 +61,14 @@ int wl18xx_process_mailbox_events(struct wl1271 *wl) 
			wl18xx_scan_completed(wl, wl->scan_wlvif);

	}



	if (vector & PERIODIC_SCAN_REPORT_EVENT_ID) {

		wl1271_debug(DEBUG_EVENT,

			     "PERIODIC_SCAN_REPORT_EVENT (results %d)",

			     mbox->number_of_sched_scan_results);



		wlcore_scan_sched_scan_results(wl);

	}



	if (vector & PERIODIC_SCAN_COMPLETE_EVENT_ID)

		wlcore_event_sched_scan_completed(wl, 1);

drivers/net/wireless/ti/wl18xx/event.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ enum { 
	BA_SESSION_RX_CONSTRAINT_EVENT_ID        = BIT(17),

	REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID      = BIT(18),

	DFS_CHANNELS_CONFIG_COMPLETE_EVENT       = BIT(19),

	PERIODIC_SCAN_REPORT_EVENT_ID            = BIT(20),

};



struct wl18xx_event_mailbox {

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

+1 −0
Original line number Diff line number Diff line
@@ -890,6 +890,7 @@ static int wl18xx_boot(struct wl1271 *wl) 
		SCAN_COMPLETE_EVENT_ID |

		RSSI_SNR_TRIGGER_0_EVENT_ID |

		PERIODIC_SCAN_COMPLETE_EVENT_ID |

		PERIODIC_SCAN_REPORT_EVENT_ID |

		DUMMY_PACKET_EVENT_ID |

		PEER_REMOVE_COMPLETE_EVENT_ID |

		BA_SESSION_RX_CONSTRAINT_EVENT_ID |

drivers/net/wireless/ti/wl18xx/scan.c

+4 −0
Original line number Diff line number Diff line
@@ -227,6 +227,10 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl, 


	cmd->tag = WL1271_SCAN_DEFAULT_TAG;



	/* create a PERIODIC_SCAN_REPORT_EVENT whenever we've got a match */

	cmd->report_threshold = 1;

	cmd->terminate_on_report = 0;



	if (cmd->active[0]) {

		u8 band = IEEE80211_BAND_2GHZ;

		ret = wl12xx_cmd_build_probe_req(wl, wlvif,