libertas: move lbs_update_channel out of assoc.c

... 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>

2 files changed, 16 insertions, 17 deletions

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 319b4f931a62..f353419acd02 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -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)
 {
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 4e6d01948372..4a82f5114ca0 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -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
  *