瀏覽代碼

iwlwifi: dvm: don't use _ni mac80211's callbacks

This is not needed since the PCIe layer disables the
bottom halves before it calls the op_mode.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Emmanuel Grumbach 11 年之前
父節點
當前提交
aeb0cf3cd0
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      drivers/net/wireless/iwlwifi/dvm/rx.c
  2. 2 2
      drivers/net/wireless/iwlwifi/dvm/tx.c

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/rx.c

@@ -786,7 +786,7 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
 
 
 	memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));
 	memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));
 
 
-	ieee80211_rx_ni(priv->hw, skb);
+	ieee80211_rx(priv->hw, skb);
 }
 }
 
 
 static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in)
 static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in)

+ 2 - 2
drivers/net/wireless/iwlwifi/dvm/tx.c

@@ -1271,7 +1271,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
 
 
 	while (!skb_queue_empty(&skbs)) {
 	while (!skb_queue_empty(&skbs)) {
 		skb = __skb_dequeue(&skbs);
 		skb = __skb_dequeue(&skbs);
-		ieee80211_tx_status_ni(priv->hw, skb);
+		ieee80211_tx_status(priv->hw, skb);
 	}
 	}
 
 
 	return 0;
 	return 0;
@@ -1411,7 +1411,7 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
 
 
 	while (!skb_queue_empty(&reclaimed_skbs)) {
 	while (!skb_queue_empty(&reclaimed_skbs)) {
 		skb = __skb_dequeue(&reclaimed_skbs);
 		skb = __skb_dequeue(&reclaimed_skbs);
-		ieee80211_tx_status_ni(priv->hw, skb);
+		ieee80211_tx_status(priv->hw, skb);
 	}
 	}
 
 
 	return 0;
 	return 0;