* [PATCH] libertas: move lbs_update_channel out of assoc.c
@ 2008-04-02 14:52 Holger Schurig
2008-04-03 3:33 ` Dan Williams
0 siblings, 1 reply; 2+ messages in thread
From: Holger Schurig @ 2008-04-02 14:52 UTC (permalink / raw)
To: libertas-dev; +Cc: Dan Williams, linux-wireless, John W. Linville
... as it has nothing to do with pure association
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Index: wireless-testing/drivers/net/wireless/libertas/assoc.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/libertas/assoc.c 2008-04-02 14:49:22.000000000 +0200
+++ wireless-testing/drivers/net/wireless/libertas/assoc.c 2008-04-02 14:50:25.000000000 +0200
@@ -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)
{
Index: wireless-testing/drivers/net/wireless/libertas/cmd.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/libertas/cmd.c 2008-04-02 14:50:03.000000000 +0200
+++ wireless-testing/drivers/net/wireless/libertas/cmd.c 2008-04-02 14:50:22.000000000 +0200
@@ -826,6 +826,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
*
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] libertas: move lbs_update_channel out of assoc.c
2008-04-02 14:52 [PATCH] libertas: move lbs_update_channel out of assoc.c Holger Schurig
@ 2008-04-03 3:33 ` Dan Williams
0 siblings, 0 replies; 2+ messages in thread
From: Dan Williams @ 2008-04-03 3:33 UTC (permalink / raw)
To: Holger Schurig; +Cc: libertas-dev, linux-wireless, John W. Linville
On Wed, 2008-04-02 at 16:52 +0200, Holger Schurig wrote:
> ... 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>
> Index: wireless-testing/drivers/net/wireless/libertas/assoc.c
> ===================================================================
> --- wireless-testing.orig/drivers/net/wireless/libertas/assoc.c 2008-04-02 14:49:22.000000000 +0200
> +++ wireless-testing/drivers/net/wireless/libertas/assoc.c 2008-04-02 14:50:25.000000000 +0200
> @@ -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)
> {
> Index: wireless-testing/drivers/net/wireless/libertas/cmd.c
> ===================================================================
> --- wireless-testing.orig/drivers/net/wireless/libertas/cmd.c 2008-04-02 14:50:03.000000000 +0200
> +++ wireless-testing/drivers/net/wireless/libertas/cmd.c 2008-04-02 14:50:22.000000000 +0200
> @@ -826,6 +826,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
> *
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-04-03 3:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-02 14:52 [PATCH] libertas: move lbs_update_channel out of assoc.c Holger Schurig
2008-04-03 3:33 ` Dan Williams
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox