Properly track the packetid of the null packets.

This commit is contained in:
Solomon Peachy 2013-04-11 10:08:57 -04:00
parent 4485ae191f
commit c0f3c2b968
2 changed files with 8 additions and 3 deletions

View File

@ -167,8 +167,8 @@ void __cw1200_cqm_bssloss_sm(struct cw1200_common *priv, int init, int good, int
priv->bss_loss_state = 0;
queue_work(priv->workqueue, &priv->bss_params_work);
} else if (bad) {
/* Just keep going until we fail? */
if (priv->bss_loss_state < 3) /* XXX ?? */
/* XXX Should we just keep going until we time out? */
if (priv->bss_loss_state < 10)
tx = 1;
} else {
cancel_delayed_work_sync(&priv->bss_loss_work);

View File

@ -1573,7 +1573,12 @@ static bool wsm_handle_tx_data(struct cw1200_common *priv,
if (action == do_tx) {
if (ieee80211_is_nullfunc(fctl)) {
wsm->queue_id = WSM_QUEUE_VIDEO; /* Higher? */
spin_lock(&priv->bss_loss_lock);
if (priv->bss_loss_state) {
priv->bss_loss_confirm_id = wsm->packet_id;
wsm->queue_id = WSM_QUEUE_VOICE;
}
spin_unlock(&priv->bss_loss_lock);
} else if (ieee80211_is_probe_req(fctl)) {
action = do_probe;
} else if (ieee80211_is_deauth(fctl) &&