← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to drivers/net/wireless/iwlwifi/iwl-tx.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/iwlwifi/iwl-tx.c
1233
1233
                return -ENXIO;
1234
1234
        }
1235
1235
 
1236
 
        if (priv->stations[sta_id].tid[tid].agg.state ==
1237
 
                                IWL_EMPTYING_HW_QUEUE_ADDBA) {
1238
 
                IWL_DEBUG_HT(priv, "AGG stop before setup done\n");
1239
 
                ieee80211_stop_tx_ba_cb_irqsafe(priv->hw, ra, tid);
1240
 
                priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;
1241
 
                return 0;
1242
 
        }
1243
 
 
1244
1236
        if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_ON)
1245
 
                IWL_WARN(priv, "Stopping AGG while state not ON or starting\n");
 
1237
                IWL_WARN(priv, "Stopping AGG while state not IWL_AGG_ON\n");
1246
1238
 
1247
1239
        tid_data = &priv->stations[sta_id].tid[tid];
1248
1240
        ssn = (tid_data->seq_number & IEEE80211_SCTL_SEQ) >> 4;