dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

libertas: move lbs_update_channel out of assoc.c

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

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Holger Schurig 2008-04-02 16:52:19 +02:00 committed by John W. Linville
parent 245bf20f9c
commit 73ab1f25d4
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/net/wireless/libertas/assoc.c
View file

@ -583,23 +583,6 @@ done:
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)
{

16
drivers/net/wireless/libertas/cmd.c
View file

@ -825,6 +825,22 @@ out:
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
*