OSDN Git Service

iwlwifi: fix fw version reading for DVM devices
authorLuca Coelho <luciano.coelho@intel.com>
Mon, 25 Apr 2016 17:02:09 +0000 (20:02 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 26 Apr 2016 09:32:07 +0000 (12:32 +0300)
commitf0d8f38cd909e072833a06b79939256c4aebe3a0
treed70266a96bd59688f4d4982d522c146351d8cd89
parent2557654df14b95141f1410127c33ed1661a8abbb
iwlwifi: fix fw version reading for DVM devices

In commit 97f95c93c8ed ("iwlwifi: remove support for fw older than
-16.ucode") we accidentally changed the fw version reading code for
DVM devices.  The code intended to remove the old fw version API,
because all MVM firmwares version 16 and above that we support don't
use it anymore.  But DVM devices still use the old FW API.

Fix that by bringing the code back in.

Reported-by: Pat Erley <pat-lkml@erley.org>
Tested-by: Kalle Valo <kvalo@codeaurora.org>
Fixes: 97f95c93c8ed ("iwlwifi: remove support for fw older than-16.ucode")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/intel/iwlwifi/iwl-drv.c
drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h