aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSara Sharon <sara.sharon@intel.com>2016-04-03 08:27:55 -0400
committerLuca Coelho <luciano.coelho@intel.com>2016-07-01 11:09:39 -0400
commit6d99c88f6003062796cade71997731caec0dd8dc (patch)
tree244a62db2ce4df1bdc9eb9a3a7ca5887bd856f80
parentc5241b0c8c0bb2bfd69effaa81e30fa26a16adda (diff)
iwlwifi: mvm: remove RX_PHY support for 9000 device
In multiple RX queues architecture, the RX_PHY notification is no longer useful as it is received in the default queue even for packets that are received on RSS queue, and cannot be accessed without locking. All the needed data is in the new RX packet metadata and firmware will no longer send this notification for 9000 devices. Remove support of it. Signed-off-by: Sara Sharon <sara.sharon@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mvm.h1
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/ops.c2
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c13
3 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 4843e02e3b0e..dd0b8f8d3378 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1321,7 +1321,6 @@ bool iwl_mvm_bcast_filter_build_cmd(struct iwl_mvm *mvm,
1321void iwl_mvm_rx_rx_phy_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb); 1321void iwl_mvm_rx_rx_phy_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);
1322void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi, 1322void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,
1323 struct iwl_rx_cmd_buffer *rxb); 1323 struct iwl_rx_cmd_buffer *rxb);
1324void iwl_mvm_rx_phy_cmd_mq(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);
1325void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi, 1324void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,
1326 struct iwl_rx_cmd_buffer *rxb, int queue); 1325 struct iwl_rx_cmd_buffer *rxb, int queue);
1327void iwl_mvm_rx_frame_release(struct iwl_mvm *mvm, struct napi_struct *napi, 1326void iwl_mvm_rx_frame_release(struct iwl_mvm *mvm, struct napi_struct *napi,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 64d2b4f04ac2..55f114d24148 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -958,8 +958,6 @@ static void iwl_mvm_rx_mq(struct iwl_op_mode *op_mode,
958 958
959 if (likely(pkt->hdr.cmd == REPLY_RX_MPDU_CMD)) 959 if (likely(pkt->hdr.cmd == REPLY_RX_MPDU_CMD))
960 iwl_mvm_rx_mpdu_mq(mvm, napi, rxb, 0); 960 iwl_mvm_rx_mpdu_mq(mvm, napi, rxb, 0);
961 else if (pkt->hdr.cmd == REPLY_RX_PHY_CMD)
962 iwl_mvm_rx_phy_cmd_mq(mvm, rxb);
963 else if (unlikely(pkt->hdr.group_id == DATA_PATH_GROUP && 961 else if (unlikely(pkt->hdr.group_id == DATA_PATH_GROUP &&
964 pkt->hdr.cmd == RX_QUEUES_NOTIFICATION)) 962 pkt->hdr.cmd == RX_QUEUES_NOTIFICATION))
965 iwl_mvm_rx_queue_notif(mvm, rxb, 0); 963 iwl_mvm_rx_queue_notif(mvm, rxb, 0);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 0f26c7004ce5..67924fc38364 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -65,19 +65,6 @@
65#include "fw-api.h" 65#include "fw-api.h"
66#include "fw-dbg.h" 66#include "fw-dbg.h"
67 67
68void iwl_mvm_rx_phy_cmd_mq(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
69{
70 mvm->ampdu_ref++;
71
72#ifdef CONFIG_IWLWIFI_DEBUGFS
73 if (mvm->last_phy_info.phy_flags & cpu_to_le16(RX_RES_PHY_FLAGS_AGG)) {
74 spin_lock(&mvm->drv_stats_lock);
75 mvm->drv_rx_stats.ampdu_count++;
76 spin_unlock(&mvm->drv_stats_lock);
77 }
78#endif
79}
80
81static inline int iwl_mvm_check_pn(struct iwl_mvm *mvm, struct sk_buff *skb, 68static inline int iwl_mvm_check_pn(struct iwl_mvm *mvm, struct sk_buff *skb,
82 int queue, struct ieee80211_sta *sta) 69 int queue, struct ieee80211_sta *sta)
83{ 70{