libertas: add access functions for mesh open/connect status
PATCH 5/6 libertas: add access functions for mesh open/connect status
Signed-off-by Holger Schurig <[email protected]>
drivers/net/wireless/libertas/main.c +2 -3
@@ -123,7 +123,7 @@ static ssize_t lbs_rtap_set(struct devicif (priv->monitormode == monitor_mode)return strlen (buf);if (!priv->monitormode) { -if (priv->infra_open || priv->mesh_open) +if (priv->infra_open ||lbs_mesh_open (priv))return -EBUSY ;if (priv->mode ==IW_MODE_INFRA ) lbs_cmd_80211_deauthenticate(priv,
@@ -619,7 +619,7 @@ static int lbs_thread(void *data)if (priv->connect_status ==LBS_CONNECTED )netif_wake_queue (priv->dev);if (priv->mesh_dev && - priv->mesh_connect_status ==LBS_CONNECTED ) +lbs_mesh_connected (priv))netif_wake_queue (priv->mesh_dev); } }
@@ -833,7 +833,6 @@ static int lbs_init_adapter(struct lbs_pmemset (priv->current_addr,0xff ,ETH_ALEN ); priv->connect_status =LBS_DISCONNECTED ; - priv->mesh_connect_status =LBS_DISCONNECTED ; priv->secinfo.auth_mode =IW_AUTH_ALG_OPEN_SYSTEM ; priv->mode =IW_MODE_INFRA ; priv->channel =DEFAULT_AD_HOC_CHANNEL ;
drivers/net/wireless/libertas/mesh.c +2 -0
@@ -196,6 +196,8 @@ int lbs_init_mesh(struct lbs_private *prlbs_deb_enter (LBS_DEB_MESH ); + priv->mesh_connect_status =LBS_DISCONNECTED ; +/* Determine mesh_fw_ver from fwrelease and fwcapinfo */ /* 5.0.16p0 9.0.0.p0 is known to NOT support any mesh */ /* 5.110.22 have mesh command with 0xa3 command id */
drivers/net/wireless/libertas/mesh.h +7 -0
@@ -84,4 +84,11 @@ void lbs_mesh_ethtool_get_strings(struct uint32_t stringset, uint8_t *s); +/* Accessors */ + +#define lbs_mesh_open (priv) (priv->mesh_open) +#define lbs_mesh_connected (priv) + (priv->mesh_connect_status == LBS_CONNECTED) + +#endif
drivers/net/wireless/libertas/cmd.c +1 -1
@@ -1304,7 +1304,7 @@ int lbs_execute_next_command(struct lbs_if ((priv->psmode !=LBS802_11POWERMODECAM ) && (priv->psstate ==PS_STATE_FULL_POWER ) && ((priv->connect_status ==LBS_CONNECTED ) || - (priv->mesh_connect_status ==LBS_CONNECTED ))) { +lbs_mesh_connected (priv))) {if (priv->secinfo.WPAenabled || priv->secinfo.WPA2enabled) {/* check for valid WPA group keys */
drivers/net/wireless/libertas/scan.c +1 -1
@@ -640,7 +640,7 @@ out:if (!priv->tx_pending_len)netif_wake_queue (priv->dev); } -if (priv->mesh_dev && (priv->mesh_connect_status ==LBS_CONNECTED )) { +if (priv->mesh_dev &&lbs_mesh_connected (priv)) {netif_carrier_on (priv->mesh_dev);if (!priv->tx_pending_len)netif_wake_queue (priv->mesh_dev);
drivers/net/wireless/libertas/tx.c +1 -1
@@ -198,7 +198,7 @@ void lbs_send_tx_feedback(struct lbs_priif (priv->connect_status ==LBS_CONNECTED )netif_wake_queue (priv->dev); -if (priv->mesh_dev && (priv->mesh_connect_status ==LBS_CONNECTED )) +if (priv->mesh_dev &&lbs_mesh_connected (priv))netif_wake_queue (priv->mesh_dev); }EXPORT_SYMBOL_GPL (lbs_send_tx_feedback);
drivers/net/wireless/libertas/wext.c +3 -3
@@ -192,7 +192,7 @@ static void copy_active_data_rates(struclbs_deb_enter (LBS_DEB_WEXT );if ((priv->connect_status !=LBS_CONNECTED ) && - (priv->mesh_connect_status !=LBS_CONNECTED )) + !lbs_mesh_connected (priv))memcpy (rates, lbs_bg_rates,MAX_RATES );else memcpy (rates, priv->curbssparams.rates,MAX_RATES );
@@ -307,7 +307,7 @@ static int mesh_get_nick(struct net_devi/* Use nickname to indicate that mesh is on */ -if (priv->mesh_connect_status ==LBS_CONNECTED ) { +if (lbs_mesh_connected (priv)) {strncpy (extra,"Mesh" ,12 ); extra[12 ] ='\0' ; dwrq->length =strlen (extra);
@@ -863,7 +863,7 @@ static struct iw_statistics *lbs_get_wir/* If we're not associated, all quality values are meaningless */ if ((priv->connect_status !=LBS_CONNECTED ) && - (priv->mesh_connect_status !=LBS_CONNECTED )) + !lbs_mesh_connected (priv)) goto out;/* Quality by RSSI */
Signature · 1 line
http://www.holgerschurig.de