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

Commit 3e4127fa authored by Alexey Fisher's avatar Alexey Fisher Committed by John W. Linville
Browse files

ipw2200: make association only if SSID is known.



'iwconfig eth1 channel 6' would trigger association to _something_,
which is wrong.  Changing the channel should (and does) trigger reassociation,
but only if there is an SSID to associate with.

Signed-off-by: default avatarAlexey Fisher <bug-track@fisher-privat.net>
Acked-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ffb82676
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -7575,8 +7575,7 @@ static int ipw_associate(void *data)
	}

	if (!(priv->config & CFG_ASSOCIATE) &&
	    !(priv->config & (CFG_STATIC_ESSID |
			      CFG_STATIC_CHANNEL | CFG_STATIC_BSSID))) {
	    !(priv->config & (CFG_STATIC_ESSID | CFG_STATIC_BSSID))) {
		IPW_DEBUG_ASSOC("Not attempting association (associate=0)\n");
		return 0;
	}