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

Commit 73ab1f25 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

libertas: move lbs_update_channel out of assoc.c 



... as it has nothing to do with pure association

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 245bf20f

drivers/net/wireless/libertas/assoc.c

+0 −17
Original line number Diff line number Diff line
@@ -583,23 +583,6 @@ static int assoc_helper_mode(struct lbs_private *priv, 
	return ret;

}





int lbs_update_channel(struct lbs_private *priv)

{

	int ret;



	/* the channel in f/w could be out of sync; get the current channel */

	lbs_deb_enter(LBS_DEB_ASSOC);



	ret = lbs_get_channel(priv);

	if (ret > 0) {

		priv->curbssparams.channel = ret;

		ret = 0;

	}

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

	return ret;

}



static int assoc_helper_channel(struct lbs_private *priv,

                                struct assoc_request * assoc_req)

{

drivers/net/wireless/libertas/cmd.c

+16 −0
Original line number Diff line number Diff line
@@ -825,6 +825,22 @@ int lbs_get_channel(struct lbs_private *priv) 
	return ret;

}



int lbs_update_channel(struct lbs_private *priv)

{

	int ret;



	/* the channel in f/w could be out of sync; get the current channel */

	lbs_deb_enter(LBS_DEB_ASSOC);



	ret = lbs_get_channel(priv);

	if (ret > 0) {

		priv->curbssparams.channel = ret;

		ret = 0;

	}

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

	return ret;

}



/**

 *  @brief Set the radio channel

 *