aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/wext.c
diff options
context:
space:
mode:
authorHolger Schurig <holgerschurig@googlemail.com>2009-12-02 09:26:01 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-12-22 13:38:29 -0500
commit602114ae595af6c89eab149cf9f939e3f7ef4a34 (patch)
tree560c6d362b846131630861998915a7407aaf9343 /drivers/net/wireless/libertas/wext.c
parente4da1a81a967c05dfde6f0498cff1f6fe6683f52 (diff)
libertas: add access functions for mesh open/connect status
Signed-off-by: Holger Schurig <holgerschurig@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/wext.c')
-rw-r--r--drivers/net/wireless/libertas/wext.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index a8eb9e1fcf36..c0c7bc40b109 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -192,7 +192,7 @@ static void copy_active_data_rates(struct lbs_private *priv, u8 *rates)
192 lbs_deb_enter(LBS_DEB_WEXT); 192 lbs_deb_enter(LBS_DEB_WEXT);
193 193
194 if ((priv->connect_status != LBS_CONNECTED) && 194 if ((priv->connect_status != LBS_CONNECTED) &&
195 (priv->mesh_connect_status != LBS_CONNECTED)) 195 !lbs_mesh_connected(priv))
196 memcpy(rates, lbs_bg_rates, MAX_RATES); 196 memcpy(rates, lbs_bg_rates, MAX_RATES);
197 else 197 else
198 memcpy(rates, priv->curbssparams.rates, MAX_RATES); 198 memcpy(rates, priv->curbssparams.rates, MAX_RATES);
@@ -307,7 +307,7 @@ static int mesh_get_nick(struct net_device *dev, struct iw_request_info *info,
307 307
308 /* Use nickname to indicate that mesh is on */ 308 /* Use nickname to indicate that mesh is on */
309 309
310 if (priv->mesh_connect_status == LBS_CONNECTED) { 310 if (lbs_mesh_connected(priv)) {
311 strncpy(extra, "Mesh", 12); 311 strncpy(extra, "Mesh", 12);
312 extra[12] = '\0'; 312 extra[12] = '\0';
313 dwrq->length = strlen(extra); 313 dwrq->length = strlen(extra);
@@ -863,7 +863,7 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)
863 863
864 /* If we're not associated, all quality values are meaningless */ 864 /* If we're not associated, all quality values are meaningless */
865 if ((priv->connect_status != LBS_CONNECTED) && 865 if ((priv->connect_status != LBS_CONNECTED) &&
866 (priv->mesh_connect_status != LBS_CONNECTED)) 866 !lbs_mesh_connected(priv))
867 goto out; 867 goto out;
868 868
869 /* Quality by RSSI */ 869 /* Quality by RSSI */