Hi Stanislaw, Thanks for the feedback. On Fri, 2010-02-19 at 08:40 -0800, Stanislaw Gruszka wrote: > Hi Reinette > On Thu, Feb 18, 2010 at 10:01:40PM -0800, Reinette Chatre wrote: > > This fix starts to address > > http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2160 . There are > > more situations in which this problem (freed tfds below zero) can occur so > > this bug is not closed yet. > > Only starts ... ,hmm so these two patches does not fix any issue. > > > diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c > > index 87ce2bd..9196d3f 100644 > > --- a/drivers/net/wireless/iwlwifi/iwl-tx.c > > +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c > > @@ -1131,6 +1131,7 @@ int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) > > struct iwl_queue *q = &txq->q; > > struct iwl_tx_info *tx_info; > > int nfreed = 0; > > + struct ieee80211_hdr *hdr; > > > > if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) { > > IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, " > > @@ -1145,13 +1146,19 @@ int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) > > > > tx_info = &txq->txb[txq->q.read_ptr]; > > iwl_tx_status(priv, tx_info->skb[0]); > > + > > + if (tx_info->skb[0]) { > > + hdr = (struct ieee80211_hdr *) > > + ((struct sk_buff *)tx_info->skb[0])->data; > > Not needed cast. > you are right, no need to cast. > > + if (hdr && ieee80211_is_data_qos(hdr->frame_control)) > > + nfreed++; > > + } > > I think additional line is needed to make things work. Something like below > should work, but I have no time to test it today. > > diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c > index de45f30..6b516c4 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-5000.c > +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c > @@ -1153,8 +1153,7 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, > tx_resp->failure_frame); > > freed = iwl_tx_queue_reclaim(priv, txq_id, index); > - if (ieee80211_is_data_qos(tx_resp->frame_ctrl)) > - priv->stations[sta_id].tid[tid].tfds_in_queue -= freed; > + priv->stations[sta_id].tid[tid].tfds_in_queue -= freed; Correct, I miss this place, there is no need to check tx_resp here, and I will prefer to do sanity check before decrement the tfds_in_queue to prevent it go into negative range. > > if (priv->mac80211_registered && > (iwl_queue_space(&txq->q) > txq->q.low_mark)) > diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c > index 281d318..c051f9f 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-tx.c > +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c > @@ -1132,6 +1132,7 @@ int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) > struct iwl_queue *q = &txq->q; > struct iwl_tx_info *tx_info; > int nfreed = 0; > + struct ieee80211_hdr *hdr; > > if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) { > IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, " > @@ -1146,13 +1147,18 @@ int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) > > tx_info = &txq->txb[txq->q.read_ptr]; > iwl_tx_status(priv, tx_info->skb[0]); > + > + if (tx_info->skb[0]) { > + hdr = (struct ieee80211_hdr *) tx_info->skb[0]->data; > + if (hdr && ieee80211_is_data_qos(hdr->frame_control)) > + nfreed++; > + } > tx_info->skb[0] = NULL; > > if (priv->cfg->ops->lib->txq_inval_byte_cnt_tbl) > priv->cfg->ops->lib->txq_inval_byte_cnt_tbl(priv, txq); > > priv->cfg->ops->lib->txq_free_tfd(priv, txq); > - nfreed++; > } > return nfreed; > } > Thanks very much for checking, I will re-submit the patch to fix the issues. Wey -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
