diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-12-12 22:50:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:07:06 -0500 |
commit | 9f4625776f96e26b15d98615337ea5916648b1e8 (patch) | |
tree | 3a2f0cce7da181875d7492c63a8f68d9c6005c64 /drivers/net/wireless/libertas | |
parent | 506e9025e030c441679fb1ae77fb0d6266c34443 (diff) |
libertas: make lbs_update_channel() function non-static
We'll want to use this for meshfrobbing
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r-- | drivers/net/wireless/libertas/assoc.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/decl.h | 1 |
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 | ||
166 | static int update_channel(struct lbs_private *priv) | 166 | int 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); | |||
77 | int lbs_reset_device(struct lbs_private *priv); | 77 | int lbs_reset_device(struct lbs_private *priv); |
78 | void lbs_host_to_card_done(struct lbs_private *priv); | 78 | void lbs_host_to_card_done(struct lbs_private *priv); |
79 | 79 | ||
80 | int lbs_update_channel(struct lbs_private *priv); | ||
80 | #endif | 81 | #endif |