diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-11 05:58:00 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-11 05:58:00 -0400 |
commit | aeb0cf3cd08ad3ddcb554ca546c560a31ca44265 (patch) | |
tree | 3a126a61ac402aa968e64a02dc7ef70b0413d8a3 | |
parent | 3c6acb614d841cafbcfc3d3015400b0f6849b7af (diff) |
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>
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/tx.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rx.c b/drivers/net/wireless/iwlwifi/dvm/rx.c index cd8377346aff..debec963c610 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rx.c +++ b/drivers/net/wireless/iwlwifi/dvm/rx.c | |||
@@ -786,7 +786,7 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv, | |||
786 | 786 | ||
787 | memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats)); | 787 | memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats)); |
788 | 788 | ||
789 | ieee80211_rx_ni(priv->hw, skb); | 789 | ieee80211_rx(priv->hw, skb); |
790 | } | 790 | } |
791 | 791 | ||
792 | static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in) | 792 | static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in) |
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c index 5b88ca78a826..3255a1723d17 100644 --- a/drivers/net/wireless/iwlwifi/dvm/tx.c +++ b/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, | |||
1271 | 1271 | ||
1272 | while (!skb_queue_empty(&skbs)) { | 1272 | while (!skb_queue_empty(&skbs)) { |
1273 | skb = __skb_dequeue(&skbs); | 1273 | skb = __skb_dequeue(&skbs); |
1274 | ieee80211_tx_status_ni(priv->hw, skb); | 1274 | ieee80211_tx_status(priv->hw, skb); |
1275 | } | 1275 | } |
1276 | 1276 | ||
1277 | return 0; | 1277 | return 0; |
@@ -1411,7 +1411,7 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, | |||
1411 | 1411 | ||
1412 | while (!skb_queue_empty(&reclaimed_skbs)) { | 1412 | while (!skb_queue_empty(&reclaimed_skbs)) { |
1413 | skb = __skb_dequeue(&reclaimed_skbs); | 1413 | skb = __skb_dequeue(&reclaimed_skbs); |
1414 | ieee80211_tx_status_ni(priv->hw, skb); | 1414 | ieee80211_tx_status(priv->hw, skb); |
1415 | } | 1415 | } |
1416 | 1416 | ||
1417 | return 0; | 1417 | return 0; |