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

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

wl1271: Fix scan parameter handling for 5GHz 



The 5GHz bands were scanned without the proper IE's in place, preventing
proper 5GHz scanning. This patches fixes the problem by storing a pointer
to the scan request (with the IE's) for all iterations of scan.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5da54f94

drivers/net/wireless/wl12xx/wl1271.h

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ struct wl1271_rx_mem_pool_addr { 
};



struct wl1271_scan {

	struct cfg80211_scan_request *req;

	u8 state;

	u8 ssid[IW_ESSID_MAX_SIZE+1];

	size_t ssid_len;

drivers/net/wireless/wl12xx/wl1271_cmd.c

+5 −3
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ int wl1271_cmd_read_memory(struct wl1271 *wl, u32 addr, void *answer, 
}



int wl1271_cmd_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,

		    const u8 *ie, size_t ie_len, u8 active_scan,

		    struct cfg80211_scan_request *req, u8 active_scan,

		    u8 high_prio, u8 band, u8 probe_requests)

{
@@ -649,7 +649,7 @@ int wl1271_cmd_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len, 
	}



	ret = wl1271_cmd_build_probe_req(wl, ssid, ssid_len,

					 ie, ie_len, ieee_band);

					 req->ie, req->ie_len, ieee_band);

	if (ret < 0) {

		wl1271_error("PROBE request template failed");

		goto out;
@@ -685,7 +685,9 @@ int wl1271_cmd_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len, 
				memcpy(wl->scan.ssid, ssid, ssid_len);

			} else

				wl->scan.ssid_len = 0;

		}

			wl->scan.req = req;

		} else

			wl->scan.req = NULL;

	}



	ret = wl1271_cmd_send(wl, CMD_SCAN, params, sizeof(*params), 0);

drivers/net/wireless/wl12xx/wl1271_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode, bool send); 
int wl1271_cmd_read_memory(struct wl1271 *wl, u32 addr, void *answer,

			   size_t len);

int wl1271_cmd_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,

		    const u8 *ie, size_t ie_len, u8 active_scan,

		    struct cfg80211_scan_request *req, u8 active_scan,

		    u8 high_prio, u8 band, u8 probe_requests);

int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id,

			    void *buf, size_t buf_len, int index, u32 rates);

drivers/net/wireless/wl12xx/wl1271_event.c

+5 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static int wl1271_event_scan_complete(struct wl1271 *wl, 
			clear_bit(WL1271_FLAG_SCANNING, &wl->flags);

			/* FIXME: ie missing! */

			wl1271_cmd_scan(wl, wl->scan.ssid, wl->scan.ssid_len,

						NULL, 0,

					wl->scan.req,

					wl->scan.active,

					wl->scan.high_prio,

					WL1271_SCAN_BAND_5_GHZ,

drivers/net/wireless/wl12xx/wl1271_main.c

+4 −6
Original line number Diff line number Diff line
@@ -1634,13 +1634,11 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw, 
		goto out;



	if (wl1271_11a_enabled())

		ret = wl1271_cmd_scan(hw->priv, ssid, len,

				      req->ie, req->ie_len, 1, 0,

				      WL1271_SCAN_BAND_DUAL, 3);

		ret = wl1271_cmd_scan(hw->priv, ssid, len, req,

				      1, 0, WL1271_SCAN_BAND_DUAL, 3);

	else

		ret = wl1271_cmd_scan(hw->priv, ssid, len,

				      req->ie, req->ie_len, 1, 0,

				      WL1271_SCAN_BAND_2_4_GHZ, 3);

		ret = wl1271_cmd_scan(hw->priv, ssid, len, req,

				      1, 0, WL1271_SCAN_BAND_2_4_GHZ, 3);



	wl1271_ps_elp_sleep(wl);