iwlwifi: mvm: fix MCC endianness bug

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h
index c69aff91404b19ab9efb5c1d558207c8ca845a58..8e4919a27cc76082c0034479003329f1a6378956 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h
@@ -1681,7 +1681,7 @@ struct iwl_mcc_update_resp {
  * @reserved1: reserved for alignment
  */
 struct iwl_mcc_chub_notif {
-       u16 mcc;
+       __le16 mcc;
        u8 source_id;
        u8 reserved1;
 } __packed; /* LAR_MCC_NOTIFY_S */

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
index 67a6c9c9af27693005ab56de2b9cbb449b69c448..e7b16ecccb86ccd8ba5f5eeee850f69bba66b856 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
@@ -913,8 +913,8 @@ void iwl_mvm_rx_chub_update_mcc(struct iwl_mvm *mvm,
        if (WARN_ON_ONCE(!iwl_mvm_is_lar_supported(mvm)))
                return;
 
-       mcc[0] = notif->mcc >> 8;
-       mcc[1] = notif->mcc & 0xff;
+       mcc[0] = le16_to_cpu(notif->mcc) >> 8;
+       mcc[1] = le16_to_cpu(notif->mcc) & 0xff;
        mcc[2] = '\0';
        src = notif->source_id;