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

Commit b4c3f34a authored by Daniel Drake's avatar Daniel Drake Committed by John W. Linville
Browse files

libertas: scan behaviour consistency improvements 



When scanning for the broadcast SSID, there is no need to add the
SSID TLV (restoring the behaviour of the driver behaviour in the wext
days, confirmed in Marvell specifications).

If bssid is unspecified, the current scan code will usually fire off an
active scan probing for the specific requested SSID. However, if a scan
is ongoing (or has just finished), those scan results will be used
instead (even if that scan is totally different, e.g. a passive scan on
channel 4 for a different SSID). Fix this inconsistency by always
firing off a scan when associating without a bssid.

Signed-off-by: default avatarDaniel Drake <dsd@laptop.org>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 38ba3c57

drivers/net/wireless/libertas/cfg.c

+17 −16
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static void lbs_scan_worker(struct work_struct *work) 
	tlv = scan_cmd->tlvbuffer;



	/* add SSID TLV */

	if (priv->scan_req->n_ssids)

	if (priv->scan_req->n_ssids && priv->scan_req->ssids[0].ssid_len > 0)

		tlv += lbs_add_ssid_tlv(tlv,

					priv->scan_req->ssids[0].ssid,

					priv->scan_req->ssids[0].ssid_len);
@@ -736,7 +736,6 @@ static void lbs_scan_worker(struct work_struct *work) 
			cfg80211_scan_done(priv->scan_req, false);



		priv->scan_req = NULL;

		priv->last_scan = jiffies;

	}



	/* Restart network */
@@ -1302,13 +1301,17 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev, 
	lbs_deb_enter(LBS_DEB_CFG80211);



	if (!sme->bssid) {

		/* Run a scan if one isn't in-progress already and if the last

		 * scan was done more than 2 seconds ago.

		 */

		if (priv->scan_req == NULL &&

		    time_after(jiffies, priv->last_scan + (2 * HZ))) {

		struct cfg80211_scan_request *creq;



		/*

		 * Scan for the requested network after waiting for existing

		 * scans to finish.

		 */

		lbs_deb_assoc("assoc: waiting for existing scans\n");

		wait_event_interruptible_timeout(priv->scan_q,

						 (priv->scan_req == NULL),

						 (15 * HZ));



		creq = _new_connect_scan_req(wiphy, sme);

		if (!creq) {

			ret = -EINVAL;
@@ -1317,9 +1320,7 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev, 


		lbs_deb_assoc("assoc: scanning for compatible AP\n");

		_internal_start_scan(priv, true, creq);

		}



		/* Wait for any in-progress scan to complete */

		lbs_deb_assoc("assoc: waiting for scan to complete\n");

		wait_event_interruptible_timeout(priv->scan_q,

						 (priv->scan_req == NULL),

drivers/net/wireless/libertas/dev.h

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ struct lbs_private { 
	wait_queue_head_t scan_q;

	/* Whether the scan was initiated internally and not by cfg80211 */

	bool internal_scan;

	unsigned long last_scan;

};



extern struct cmd_confirm_sleep confirm_sleep;