Commit 688cd8bd authored Mar 04, 2019 by Arnd Bergmann Committed by Kalle Valo Mar 07, 2019

iwlwifi: fix 64-bit division



do_div() expects unsigned operands and otherwise triggers a warning like:

drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c:465:2: error: comparison of distinct pointer types ('typeof ((rtt_avg)) *' (aka 'long long *') and 'uint64_t *' (aka 'unsigned long long *')) [-Werror,-Wcompare-distinct-pointer-types]
        do_div(rtt_avg, 6666);
        ^~~~~~~~~~~~~~~~~~~~~
include/asm-generic/div64.h:222:28: note: expanded from macro 'do_div'
        (void)(((typeof((n)) *)0) == ((uint64_t *)0));  \
               ~~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~
1 error generated.

Change the do_div() to the simpler div_s64() that can handle
negative inputs correctly.

Fixes: 937b10c0 ("iwlwifi: mvm: add debug prints for FTM")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent 47c2be0c

drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -460,9 +460,7 @@ static int iwl_mvm_ftm_range_resp_valid(struct iwl_mvm *mvm, u8 request_id,
		static void iwl_mvm_debug_range_resp(struct iwl_mvm *mvm, u8 index,
		struct cfg80211_pmsr_result *res)
		{
		s64 rtt_avg = res->ftm.rtt_avg * 100;

		do_div(rtt_avg, 6666);
		s64 rtt_avg = div_s64(res->ftm.rtt_avg * 100, 6666);

		IWL_DEBUG_INFO(mvm, "entry %d\n", index);
		IWL_DEBUG_INFO(mvm, "\tstatus: %d\n", res->status);

Admin message