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

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

wlcore: update channel_switch/stop_channel_switch commands 



Some fields were added to the channel_switch and
stop_channel_switch commands. Unfortunately,
the new 18xx channel_switch struct is not backward
compatible with the 12xx channel switch struct.

Add a new channel_switch op to wlcore, and update
the driver accordingly.

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

drivers/net/wireless/ti/wl12xx/cmd.c

+37 −0
Original line number Diff line number Diff line
@@ -284,3 +284,40 @@ int wl128x_cmd_radio_parms(struct wl1271 *wl) 
	kfree(radio_parms);

	return ret;

}



int wl12xx_cmd_channel_switch(struct wl1271 *wl,

			      struct wl12xx_vif *wlvif,

			      struct ieee80211_channel_switch *ch_switch)

{

	struct wl12xx_cmd_channel_switch *cmd;

	int ret;



	wl1271_debug(DEBUG_ACX, "cmd channel switch");



	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);

	if (!cmd) {

		ret = -ENOMEM;

		goto out;

	}



	cmd->role_id = wlvif->role_id;

	cmd->channel = ch_switch->channel->hw_value;

	cmd->switch_time = ch_switch->count;

	cmd->stop_tx = ch_switch->block_tx;



	/* FIXME: control from mac80211 in the future */

	/* Enable TX on the target channel */

	cmd->post_switch_tx_disable = 0;



	ret = wl1271_cmd_send(wl, CMD_CHANNEL_SWITCH, cmd, sizeof(*cmd), 0);

	if (ret < 0) {

		wl1271_error("failed to send channel switch command");

		goto out_free;

	}



out_free:

	kfree(cmd);



out:

	return ret;

}

drivers/net/wireless/ti/wl12xx/cmd.h

+20 −0
Original line number Diff line number Diff line
@@ -103,10 +103,30 @@ struct wl1271_ext_radio_parms_cmd { 
	u8 padding[3];

} __packed;



struct wl12xx_cmd_channel_switch {

	struct wl1271_cmd_header header;



	u8 role_id;



	/* The new serving channel */

	u8 channel;

	/* Relative time of the serving channel switch in TBTT units */

	u8 switch_time;

	/* Stop the role TX, should expect it after radar detection */

	u8 stop_tx;

	/* The target channel tx status 1-stopped 0-open*/

	u8 post_switch_tx_disable;



	u8 padding[3];

} __packed;



int wl1271_cmd_general_parms(struct wl1271 *wl);

int wl128x_cmd_general_parms(struct wl1271 *wl);

int wl1271_cmd_radio_parms(struct wl1271 *wl);

int wl128x_cmd_radio_parms(struct wl1271 *wl);

int wl1271_cmd_ext_radio_parms(struct wl1271 *wl);

int wl12xx_cmd_channel_switch(struct wl1271 *wl,

			      struct wl12xx_vif *wlvif,

			      struct ieee80211_channel_switch *ch_switch);



#endif /* __WL12XX_CMD_H__ */

drivers/net/wireless/ti/wl12xx/main.c

+1 −0
Original line number Diff line number Diff line
@@ -1632,6 +1632,7 @@ static struct wlcore_ops wl12xx_ops = { 
	.sched_scan_stop	= wl12xx_scan_sched_scan_stop,

	.get_spare_blocks	= wl12xx_get_spare_blocks,

	.set_key		= wl12xx_set_key,

	.channel_switch		= wl12xx_cmd_channel_switch,

	.pre_pkt_send		= NULL,

};

drivers/net/wireless/ti/wl18xx/Makefile

+1 −1
Original line number Diff line number Diff line 
wl18xx-objs	= main.o acx.o tx.o io.o debugfs.o scan.o

wl18xx-objs	= main.o acx.o tx.o io.o debugfs.o scan.o cmd.o



obj-$(CONFIG_WL18XX)		+= wl18xx.o

drivers/net/wireless/ti/wl18xx/cmd.c

0 → 100644
+80 −0
Original line number Diff line number Diff line 
/*

 * This file is part of wl18xx

 *

 * Copyright (C) 2011 Texas Instruments Inc.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA

 * 02110-1301 USA

 *

 */



#include "../wlcore/cmd.h"

#include "../wlcore/debug.h"

#include "../wlcore/hw_ops.h"



#include "cmd.h"



int wl18xx_cmd_channel_switch(struct wl1271 *wl,

			      struct wl12xx_vif *wlvif,

			      struct ieee80211_channel_switch *ch_switch)

{

	struct wl18xx_cmd_channel_switch *cmd;

	u32 supported_rates;

	int ret;



	wl1271_debug(DEBUG_ACX, "cmd channel switch");



	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);

	if (!cmd) {

		ret = -ENOMEM;

		goto out;

	}



	cmd->role_id = wlvif->role_id;

	cmd->channel = ch_switch->channel->hw_value;

	cmd->switch_time = ch_switch->count;

	cmd->stop_tx = ch_switch->block_tx;



	switch (ch_switch->channel->band) {

	case IEEE80211_BAND_2GHZ:

		cmd->band = WLCORE_BAND_2_4GHZ;

		break;

	case IEEE80211_BAND_5GHZ:

		cmd->band = WLCORE_BAND_5GHZ;

		break;

	default:

		wl1271_error("invalid channel switch band: %d",

			     ch_switch->channel->band);

		ret = -EINVAL;

		goto out_free;

	}



	supported_rates = CONF_TX_ENABLED_RATES | CONF_TX_MCS_RATES |

			  wlcore_hw_sta_get_ap_rate_mask(wl, wlvif);

	if (wlvif->p2p)

		supported_rates &= ~CONF_TX_CCK_RATES;

	cmd->local_supported_rates = cpu_to_le32(supported_rates);

	cmd->channel_type = wlvif->channel_type;



	ret = wl1271_cmd_send(wl, CMD_CHANNEL_SWITCH, cmd, sizeof(*cmd), 0);

	if (ret < 0) {

		wl1271_error("failed to send channel switch command");

		goto out_free;

	}



out_free:

	kfree(cmd);

out:

	return ret;

}