From: Emmanuel Grumbach Date: Tue, 18 Mar 2025 09:29:43 +0000 (+0100) Subject: wifi: iwlwifi: remove a buggy else statement in op_mode selection X-Git-Tag: v6.15-rc1~160^2~20^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6f98260d76c9204cf799b281211f4a62f932678;p=thirdparty%2Fkernel%2Flinux.git wifi: iwlwifi: remove a buggy else statement in op_mode selection This led to weird behavior. The next debug print was not printed. Fixes: d1e879ec600f9 ("wifi: iwlwifi: add iwlmld sub-driver") Signed-off-by: Emmanuel Grumbach Link: https://patch.msgid.link/20250318103019.bf54d0474909.Icfb129d4cf13b42b13e2ac4aa1bd171ef46bf561@changeid Signed-off-by: Johannes Berg --- diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index dcf07ac042f74..15d2211e565c3 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2005-2014, 2018-2024 Intel Corporation + * Copyright (C) 2005-2014, 2018-2025 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -1732,7 +1732,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) #if IS_ENABLED(CONFIG_IWLMLD) if (pieces->major >= IWL_MLD_SUPPORTED_FW_VERSION) op = &iwlwifi_opmode_table[MLD_OP_MODE]; - else #else if (pieces->major >= IWL_MLD_SUPPORTED_FW_VERSION) { IWL_ERR(drv,