aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/power.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2019-02-18 20:10:46 +0200
committerKalle Valo <kvalo@codeaurora.org>2019-02-18 20:10:46 +0200
commitf77ecde5f206195cdce16dd2ac92d7ca0305ba2b (patch)
tree19c2cf70c2fd4b068bfc67d8188579aae55a9822 /drivers/net/wireless/intel/iwlwifi/mvm/power.c
parent34025a1056a3c82b7e16992da9af54d729dd77fe (diff)
parent99944b73069d8bcea573c07df8dc8d4f33e78586 (diff)
downloadkernel_replicant_linux-f77ecde5f206195cdce16dd2ac92d7ca0305ba2b.tar.gz
kernel_replicant_linux-f77ecde5f206195cdce16dd2ac92d7ca0305ba2b.tar.bz2
kernel_replicant_linux-f77ecde5f206195cdce16dd2ac92d7ca0305ba2b.zip
Merge tag 'iwlwifi-next-for-kalle-2019-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Fourth batch of iwlwifi patches intended for v5.1 * Work on the new debugging infrastructure continues; * FTM (Fine Timing Measurement) initiator and responder implementation; * Support for a new device family started; * Bump supported FW API to 46; * General bugfixes; * Other cleanups;
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/power.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/power.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/power.c b/drivers/net/wireless/intel/iwlwifi/mvm/power.c
index df9f1d6cdf78..36f5fa1ee793 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/power.c
@@ -8,7 +8,7 @@
* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
* Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
* Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018 - 2019 Intel Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@
* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
* Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
* Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018 - 2019 Intel Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -544,6 +544,9 @@ int iwl_mvm_power_update_device(struct iwl_mvm *mvm)
cmd.flags &=
cpu_to_le16(~DEVICE_POWER_FLAGS_POWER_SAVE_ENA_MSK);
#endif
+ if (mvm->ext_clock_valid)
+ cmd.flags |= cpu_to_le16(DEVICE_POWER_FLAGS_32K_CLK_VALID_MSK);
+
IWL_DEBUG_POWER(mvm,
"Sending device power command with flags = 0x%X\n",
cmd.flags);