Update hostapd to 0.6.4

[openwrt.git] / package / libertas / src / join.c

diff --git a/package/libertas/src/join.c b/package/libertas/src/join.c
index 14425d9..2d45080 100644 (file)
--- a/package/libertas/src/join.c
+++ b/package/libertas/src/join.c
@@ -781,8 +781,8 @@ int lbs_ret_80211_associate(struct lbs_private *priv,
        priv->numSNRNF = 0;
 
        netif_carrier_on(priv->dev);
        priv->numSNRNF = 0;
 
        netif_carrier_on(priv->dev);

-       netif_wake_queue(priv->dev);
-
+       if (!priv->tx_pending_len)
+               netif_wake_queue(priv->dev);

 
        memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);
        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
 
        memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);
        wrqu.ap_addr.sa_family = ARPHRD_ETHER;


@@ -865,7 +865,8 @@ int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,
        priv->curbssparams.ssid_len = bss->ssid_len;
 
        netif_carrier_on(priv->dev);
        priv->curbssparams.ssid_len = bss->ssid_len;
 
        netif_carrier_on(priv->dev);

-       netif_wake_queue(priv->dev);
+       if (!priv->tx_pending_len)
+               netif_wake_queue(priv->dev);

 
        memset(&wrqu, 0, sizeof(wrqu));
        memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);
 
        memset(&wrqu, 0, sizeof(wrqu));
        memcpy(wrqu.ap_addr.sa_data, priv->curbssparams.bssid, ETH_ALEN);