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

Commit 121af049 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: don't handle change_channel while associated 



Currently, CHANGE_CHANNEL indication while
associated is considered as roaming attempt.

However, with the new auth/assoc redesign,
we no longer have to handle this case,
so remove it.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 249e9698

drivers/net/wireless/wl12xx/main.c

+14 −27
Original line number Diff line number Diff line
@@ -2515,26 +2515,14 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
				wl1271_warning("rate policy for channel "

					       "failed %d", ret);



			if (test_bit(WLVIF_FLAG_STA_ASSOCIATED,

				     &wlvif->flags)) {

				if (wl12xx_dev_role_started(wlvif)) {

					/* roaming */

					ret = wl12xx_croc(wl,

							  wlvif->dev_role_id);

					if (ret < 0)

						return ret;

				}

				ret = wl1271_join(wl, wlvif, false);

				if (ret < 0)

					wl1271_warning("cmd join on channel "

						       "failed %d", ret);

			} else {

			/*

			 * change the ROC channel. do it only if we are

			 * not idle. otherwise, CROC will be called

			 * anyway.

			 */

				if (wl12xx_dev_role_started(wlvif) &&

			if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED,

				      &wlvif->flags) &&

			    wl12xx_dev_role_started(wlvif) &&

			    !(conf->flags & IEEE80211_CONF_IDLE)) {

				ret = wl12xx_stop_dev(wl, wlvif);

				if (ret < 0)
@@ -2546,7 +2534,6 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
			}

		}

	}

	}



	if ((changed & IEEE80211_CONF_CHANGE_PS) && !is_ap) {