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

2 files changed, 10 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index a51e0eaa1334..56a9361a847f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -710,10 +710,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
                 return;
         }
 
-        if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) {
-                iwl3945_pass_packet_to_mac80211(priv, rxb, &rx_status);
-                return;
-        }
+
 
         /* Convert 3945's rssi indicator to dBm */
         rx_status.signal = rx_stats->rssi - IWL_RSSI_OFFSET;
@@ -775,6 +772,11 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
                 priv->last_rx_noise = rx_status.noise;
         }
 
+        if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) {
+                iwl3945_pass_packet_to_mac80211(priv, rxb, &rx_status);
+                return;
+        }
+
         switch (le16_to_cpu(header->frame_control) & IEEE80211_FCTL_FTYPE) {
         case IEEE80211_FTYPE_MGMT:
                 switch (le16_to_cpu(header->frame_control) &
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index f72cd0bf6aa3..0182e4da8e35 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -962,16 +962,16 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         if (ret)
                 return ret;
 
-        if ((iwl_queue_space(q) < q->high_mark)
-            && priv->mac80211_registered) {
+        if ((iwl_queue_space(q) < q->high_mark) && priv->mac80211_registered) {
                 if (wait_write_ptr) {
                         spin_lock_irqsave(&priv->lock, flags);
                         txq->need_update = 1;
                         iwl_txq_update_write_ptr(priv, txq);
                         spin_unlock_irqrestore(&priv->lock, flags);
+                } else {
+                        ieee80211_stop_queue(priv->hw,
+                                             skb_get_queue_mapping(skb));
                 }
-
-                ieee80211_stop_queue(priv->hw, skb_get_queue_mapping(skb));
         }
 
         return 0;