Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00.h
Simple merge

diff --cc net/mac80211/agg-tx.c
index 1958c7c42cd9e7a1cb49fd79830d1f375dd39b37,a24e59816b9370018d9a01be95f065f9eb2a5745..bd765f30dba2027c933dfed8782dce63b938f803
--- 1/net/mac80211/agg-tx.c
--- 2/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@@ -381,8 -381,19 +381,16 @@@ static void ieee80211_agg_splice_packet
                &local->hw, queue,
                IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
  
+       if (!(sta->ampdu_mlme.tid_state_tx[tid] & HT_ADDBA_REQUESTED_MSK))
+               return;
+ 
+       if (WARN(!sta->ampdu_mlme.tid_tx[tid],
+                "TID %d gone but expected when splicing aggregates from"
+                "the pending queue\n", tid))
+               return;
+ 
        if (!skb_queue_empty(&sta->ampdu_mlme.tid_tx[tid]->pending)) {
                spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
 -              /* mark queue as pending, it is stopped already */
 -              __set_bit(IEEE80211_QUEUE_STOP_REASON_PENDING,
 -                        &local->queue_stop_reasons[queue]);
                /* copy over remaining packets */
                skb_queue_splice_tail_init(
                        &sta->ampdu_mlme.tid_tx[tid]->pending,