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

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

wl12xx: fix erroneous commit (cb5ae0) 



Due to rebase error, the patch for commit cb5ae0 ("wl12xx: configure
rates when working in ibss mode") was wrong - a blob was added
into the wrong function. fix it.

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

drivers/net/wireless/wl12xx/main.c

+18 −18
Original line number Diff line number Diff line
@@ -2900,24 +2900,6 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl, 
		}

	}



	if (changed & BSS_CHANGED_IBSS) {

		wl1271_debug(DEBUG_ADHOC, "ibss_joined: %d",

			     bss_conf->ibss_joined);



		if (bss_conf->ibss_joined) {

			u32 rates = bss_conf->basic_rates;

			wl->basic_rate_set = wl1271_tx_enabled_rates_get(wl,

									 rates);

			wl->basic_rate = wl1271_tx_min_rate_get(wl);



			/* by default, use 11b rates */

			wl->rate_set = CONF_TX_IBSS_DEFAULT_RATES;

			ret = wl1271_acx_sta_rate_policies(wl);

			if (ret < 0)

				goto out;

		}

	}



	ret = wl1271_bss_erp_info_changed(wl, bss_conf, changed);

	if (ret < 0)

		goto out;
@@ -3143,6 +3125,24 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, 
		}

	}



	if (changed & BSS_CHANGED_IBSS) {

		wl1271_debug(DEBUG_ADHOC, "ibss_joined: %d",

			     bss_conf->ibss_joined);



		if (bss_conf->ibss_joined) {

			u32 rates = bss_conf->basic_rates;

			wl->basic_rate_set = wl1271_tx_enabled_rates_get(wl,

									 rates);

			wl->basic_rate = wl1271_tx_min_rate_get(wl);



			/* by default, use 11b rates */

			wl->rate_set = CONF_TX_IBSS_DEFAULT_RATES;

			ret = wl1271_acx_sta_rate_policies(wl);

			if (ret < 0)

				goto out;

		}

	}



	ret = wl1271_bss_erp_info_changed(wl, bss_conf, changed);

	if (ret < 0)

		goto out;