diff options
| author | Johannes Berg | 2017-03-13 12:07:52 +0100 |
|---|---|---|
| committer | Luca Coelho | 2017-06-02 13:07:48 +0200 |
| commit | 56c1f3c4bd1ee04f8032345fba97cff616fea22a (patch) | |
| tree | f2888fffa5617cc2404dc849d70ec9bb65a3315d | |
| parent | iwlwifi: mvm: use proper sta_addr in firmware API (diff) | |
| download | kernel-qcow2-linux-56c1f3c4bd1ee04f8032345fba97cff616fea22a.tar.gz kernel-qcow2-linux-56c1f3c4bd1ee04f8032345fba97cff616fea22a.tar.xz kernel-qcow2-linux-56c1f3c4bd1ee04f8032345fba97cff616fea22a.zip | |
iwlwifi: mvm: fix MCC endianness bug
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h index c69aff91404b..8e4919a27cc7 100644 --- 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 67a6c9c9af27..e7b16ecccb86 100644 --- 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; |