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

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

wl1251: add channel to wl1251_cmd_join() parameters 



Because join channel tunes to a channel, better to make it more obvious
by adding a parameter for it.

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 9780279c

drivers/net/wireless/wl12xx/wl1251_cmd.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -251,8 +251,8 @@ int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable) 
	return ret;

	return ret;

}

}





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

int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,

		    u8 dtim_interval)

		    u16 beacon_interval, u8 dtim_interval)

{

{

	unsigned long timeout;

	unsigned long timeout;

	struct cmd_join *join;

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

	if (ret < 0)

		goto out;

		goto out;





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

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

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

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

		     beacon_interval, dtim_interval);

		     channel, beacon_interval, dtim_interval);





	/* Reverse order BSSID */

	/* Reverse order BSSID */

	bssid = (u8 *) &join->bssid_lsb;

	bssid = (u8 *) &join->bssid_lsb;
@@ -291,7 +291,7 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval, 
	join->beacon_interval = beacon_interval;

	join->beacon_interval = beacon_interval;

	join->dtim_interval = dtim_interval;

	join->dtim_interval = dtim_interval;

	join->bss_type = bss_type;

	join->bss_type = bss_type;

	join->channel = wl->channel;

	join->channel = channel;

	join->ctrl = JOIN_CMD_CTRL_TX_FLUSH;

	join->ctrl = JOIN_CMD_CTRL_TX_FLUSH;





	ret = wl1251_cmd_send(wl, CMD_START_JOIN, join, sizeof(*join));

	ret = wl1251_cmd_send(wl, CMD_START_JOIN, join, sizeof(*join));

drivers/net/wireless/wl12xx/wl1251_cmd.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -36,8 +36,8 @@ int wl1251_cmd_configure(struct wl1251 *wl, u16 id, void *buf, size_t len); 
int wl1251_cmd_vbm(struct wl1251 *wl, u8 identity,

int wl1251_cmd_vbm(struct wl1251 *wl, u8 identity,

		   void *bitmap, u16 bitmap_len, u8 bitmap_control);

		   void *bitmap, u16 bitmap_len, u8 bitmap_control);

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

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,

int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,

		    u8 dtim_interval);

		    u16 beacon_interval, u8 dtim_interval);

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

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

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

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

			   size_t len);

			   size_t len);

drivers/net/wireless/wl12xx/wl1251_main.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -324,7 +324,7 @@ static void wl1251_filter_work(struct work_struct *work) 
	if (ret < 0)

	if (ret < 0)

		goto out;

		goto out;





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

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

				   wl->dtim_period);

				   wl->dtim_period);

	if (ret < 0)

	if (ret < 0)

		goto out_sleep;

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

		goto out;





	if (channel != wl->channel) {

	if (channel != wl->channel) {

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

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

					   wl->dtim_period);

				      wl->beacon_int, wl->dtim_period);

		if (ret < 0)

		if (ret < 0)

			goto out_sleep;

			goto out_sleep;
@@ -1123,7 +1123,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, 
			goto out;

			goto out;





		if (wl->bss_type != BSS_TYPE_IBSS) {

		if (wl->bss_type != BSS_TYPE_IBSS) {

			ret = wl1251_cmd_join(wl, wl->bss_type,

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

					      wl->beacon_int,

					      wl->beacon_int,

					      wl->dtim_period);

					      wl->dtim_period);

			if (ret < 0)

			if (ret < 0)
@@ -1152,7 +1152,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, 
			goto out;

			goto out;





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

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

				      wl->dtim_period);

				      wl->channel, wl->dtim_period);





		if (ret < 0)

		if (ret < 0)

			goto out;

			goto out;