iwlwifi: mvm: capture the FCS in monitor mode

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / mvm / mac-ctxt.c

diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index ab5a7ac90dcd68948882cc245cd8df04e62df37c..f41f9b079831cfe7722b4d0c23203640993e7249 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@ -719,7 +719,9 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm,
        cmd.filter_flags = cpu_to_le32(MAC_FILTER_IN_PROMISC |
                                       MAC_FILTER_IN_CONTROL_AND_MGMT |
                                       MAC_FILTER_IN_BEACON |
-                                      MAC_FILTER_IN_PROBE_REQUEST);
+                                      MAC_FILTER_IN_PROBE_REQUEST |
+                                      MAC_FILTER_IN_CRC32);
+       mvm->hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS;
 
        return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);
 }
@@ -1122,6 +1124,10 @@ int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
        }
 
        mvmvif->uploaded = false;
+
+       if (vif->type == NL80211_IFTYPE_MONITOR)
+               mvm->hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
+
        return 0;
 }