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

Commit 823eaa2c authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

libertas: allow setting channel on mshX device 



Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f5956bf1

drivers/net/wireless/libertas/wext.c

+52 −1
Original line number Diff line number Diff line
@@ -959,6 +959,57 @@ static int lbs_set_freq(struct net_device *dev, struct iw_request_info *info, 
	return ret;

}



static int lbs_mesh_set_freq(struct net_device *dev,

			     struct iw_request_info *info,

			     struct iw_freq *fwrq, char *extra)

{

	struct lbs_private *priv = dev->priv;

	struct chan_freq_power *cfp;

	int ret = -EINVAL;



	lbs_deb_enter(LBS_DEB_WEXT);



	/* If setting by frequency, convert to a channel */

	if (fwrq->e == 1) {

		long f = fwrq->m / 100000;



		cfp = find_cfp_by_band_and_freq(priv, 0, f);

		if (!cfp) {

			lbs_deb_wext("invalid freq %ld\n", f);

			goto out;

		}



		fwrq->e = 0;

		fwrq->m = (int) cfp->channel;

	}



	/* Setting by channel number */

	if (fwrq->m > 1000 || fwrq->e > 0) {

		goto out;

	}



	cfp = lbs_find_cfp_by_band_and_channel(priv, 0, fwrq->m);

	if (!cfp) {

		goto out;

	}



	if (fwrq->m != priv->curbssparams.channel) {

		lbs_deb_wext("mesh channel change forces eth disconnect\n");

		if (priv->mode == IW_MODE_INFRA)

			lbs_send_deauthentication(priv);

		else if (priv->mode == IW_MODE_ADHOC)

			lbs_stop_adhoc_network(priv);

	}

	priv->curbssparams.channel = fwrq->m;

	lbs_mesh_config(priv, 0);

	lbs_mesh_config(priv, 1);

	ret = 0;



out:

	lbs_deb_leave_args(LBS_DEB_WEXT, "ret %d", ret);

	return ret;

}



static int lbs_set_rate(struct net_device *dev, struct iw_request_info *info,

		  struct iw_param *vwrq, char *extra)

{
@@ -2097,7 +2148,7 @@ static const iw_handler mesh_wlan_handler[] = { 
	(iw_handler) lbs_get_name,	/* SIOCGIWNAME */

	(iw_handler) NULL,	/* SIOCSIWNWID */

	(iw_handler) NULL,	/* SIOCGIWNWID */

	(iw_handler) lbs_set_freq,	/* SIOCSIWFREQ */

	(iw_handler) lbs_mesh_set_freq,	/* SIOCSIWFREQ */

	(iw_handler) lbs_get_freq,	/* SIOCGIWFREQ */

	(iw_handler) NULL,		/* SIOCSIWMODE */

	(iw_handler) mesh_wlan_get_mode,	/* SIOCGIWMODE */