aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/libertas/assoc.c17
-rw-r--r--drivers/net/wireless/libertas/cmd.c16
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:
583 return ret; 583 return ret;
584} 584}
585 585
586
587int lbs_update_channel(struct lbs_private *priv)
588{
589 int ret;
590
591 /* the channel in f/w could be out of sync; get the current channel */
592 lbs_deb_enter(LBS_DEB_ASSOC);
593
594 ret = lbs_get_channel(priv);
595 if (ret > 0) {
596 priv->curbssparams.channel = ret;
597 ret = 0;
598 }
599 lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
600 return ret;
601}
602
603static int assoc_helper_channel(struct lbs_private *priv, 586static int assoc_helper_channel(struct lbs_private *priv,
604 struct assoc_request * assoc_req) 587 struct assoc_request * assoc_req)
605{ 588{
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:
825 return ret; 825 return ret;
826} 826}
827 827
828int lbs_update_channel(struct lbs_private *priv)
829{
830 int ret;
831
832 /* the channel in f/w could be out of sync; get the current channel */
833 lbs_deb_enter(LBS_DEB_ASSOC);
834
835 ret = lbs_get_channel(priv);
836 if (ret > 0) {
837 priv->curbssparams.channel = ret;
838 ret = 0;
839 }
840 lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
841 return ret;
842}
843
828/** 844/**
829 * @brief Set the radio channel 845 * @brief Set the radio channel
830 * 846 *