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

Commit 7a33732f authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville
Browse files

wl1251: remove wait parameter from wl1251_cmd_join() 



We should wait everytime for the join command to finish, not waiting for
it might create problems.

Signed-off-by: default avatarKalle Valo <kalle.valo@nokia.com>
Reviewed-by: default avatarVidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e2fd4611

drivers/net/wireless/wl12xx/wl1251_cmd.c

+4 −6
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable) 
}



int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval,

		    u8 dtim_interval, bool wait)

		    u8 dtim_interval)

{

	unsigned long timeout;

	struct cmd_join *join;
@@ -273,10 +273,9 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval, 
	if (ret < 0)

		goto out;



	wl1251_debug(DEBUG_CMD, "cmd join%s %d %d%s",

	wl1251_debug(DEBUG_CMD, "cmd join%s %d %d",

		     bss_type == BSS_TYPE_IBSS ? " ibss" : "",

		     beacon_interval, dtim_interval,

		     wait ? " wait" : "");

		     beacon_interval, dtim_interval);



	/* Reverse order BSSID */

	bssid = (u8 *) &join->bssid_lsb;
@@ -307,7 +306,6 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval, 
	 * ugly hack: we should wait for JOIN_EVENT_COMPLETE_ID but to

	 * simplify locking we just sleep instead, for now

	 */

	if (wait)

	msleep(10);



out:

drivers/net/wireless/wl12xx/wl1251_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int wl1251_cmd_vbm(struct wl1251 *wl, u8 identity, 
		   void *bitmap, u16 bitmap_len, u8 bitmap_control);

int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable);

int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval,

		    u8 dtim_interval, bool wait);

		    u8 dtim_interval);

int wl1251_cmd_ps_mode(struct wl1251 *wl, u8 ps_mode);

int wl1251_cmd_read_memory(struct wl1251 *wl, u32 addr, void *answer,

			   size_t len);

drivers/net/wireless/wl12xx/wl1251_main.c

+4 −4
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static void wl1251_filter_work(struct work_struct *work) 
		goto out;



	ret = wl1251_cmd_join(wl, wl->bss_type, wl->beacon_int,

				   wl->dtim_period, false);

				   wl->dtim_period);

	if (ret < 0)

		goto out_sleep;
@@ -565,7 +565,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) 


	if (channel != wl->channel) {

		ret = wl1251_cmd_join(wl, wl->bss_type, wl->beacon_int,

					   wl->dtim_period, false);

					   wl->dtim_period);

		if (ret < 0)

			goto out_sleep;
@@ -1124,7 +1124,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, 
		if (wl->bss_type != BSS_TYPE_IBSS) {

			ret = wl1251_cmd_join(wl, wl->bss_type,

					      wl->beacon_int,

					      wl->dtim_period, true);

					      wl->dtim_period);

			if (ret < 0)

				goto out_sleep;

			wl1251_warning("Set ctsprotect failed %d", ret);
@@ -1151,7 +1151,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, 
			goto out;



		ret = wl1251_cmd_join(wl, wl->bss_type, wl->beacon_int,

				      wl->dtim_period, false);

				      wl->dtim_period);



		if (ret < 0)

			goto out;