aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/libertas/assoc.c8
-rw-r--r--drivers/net/wireless/libertas/decl.h1
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 21a569617421..ff976ebcd014 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -163,7 +163,7 @@ done:
163} 163}
164 164
165 165
166static int update_channel(struct lbs_private *priv) 166int lbs_update_channel(struct lbs_private *priv)
167{ 167{
168 int ret; 168 int ret;
169 169
@@ -184,7 +184,7 @@ void lbs_sync_channel(struct work_struct *work)
184 sync_channel); 184 sync_channel);
185 185
186 lbs_deb_enter(LBS_DEB_ASSOC); 186 lbs_deb_enter(LBS_DEB_ASSOC);
187 if (update_channel(priv) != 0) 187 if (lbs_update_channel(priv))
188 lbs_pr_info("Channel synchronization failed."); 188 lbs_pr_info("Channel synchronization failed.");
189 lbs_deb_leave(LBS_DEB_ASSOC); 189 lbs_deb_leave(LBS_DEB_ASSOC);
190} 190}
@@ -196,7 +196,7 @@ static int assoc_helper_channel(struct lbs_private *priv,
196 196
197 lbs_deb_enter(LBS_DEB_ASSOC); 197 lbs_deb_enter(LBS_DEB_ASSOC);
198 198
199 ret = update_channel(priv); 199 ret = lbs_update_channel(priv);
200 if (ret < 0) { 200 if (ret < 0) {
201 lbs_deb_assoc("ASSOC: channel: error getting channel.\n"); 201 lbs_deb_assoc("ASSOC: channel: error getting channel.\n");
202 } 202 }
@@ -220,7 +220,7 @@ static int assoc_helper_channel(struct lbs_private *priv,
220 /* FIXME: shouldn't need to grab the channel _again_ after setting 220 /* FIXME: shouldn't need to grab the channel _again_ after setting
221 * it since the firmware is supposed to return the new channel, but 221 * it since the firmware is supposed to return the new channel, but
222 * whatever... */ 222 * whatever... */
223 ret = update_channel(priv); 223 ret = lbs_update_channel(priv);
224 if (ret < 0) 224 if (ret < 0)
225 lbs_deb_assoc("ASSOC: channel: error getting channel.\n"); 225 lbs_deb_assoc("ASSOC: channel: error getting channel.\n");
226 226
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index 9b0ef166185d..45f081b68706 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -77,4 +77,5 @@ int lbs_stop_card(struct lbs_private *priv);
77int lbs_reset_device(struct lbs_private *priv); 77int lbs_reset_device(struct lbs_private *priv);
78void lbs_host_to_card_done(struct lbs_private *priv); 78void lbs_host_to_card_done(struct lbs_private *priv);
79 79
80int lbs_update_channel(struct lbs_private *priv);
80#endif 81#endif