From patchwork Tue Apr 1 03:45:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 14034329 X-Patchwork-Delegate: johannes@sipsolutions.net Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F4D49461 for ; Tue, 1 Apr 2025 03:46:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743479178; cv=none; b=ZQ+1LcevfAKGo773ipTrfiYY9fC2C5ztMOs8njAZ0tZfO22ETDPvUcKev203dyLanXuED+2vojBWnA1SwuZnALhDAcLhiIm19gVasqlHIkRsDE1k+1nUTAwDWyr/DOITXI8Ht54t5U3Hr+1p2X2bvTa5AdICfkAfCm4i/m12Eo8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743479178; c=relaxed/simple; bh=yKQQTJgnlsAt5EUCf0XqaNI7pQyKyO/qu8kMRUmo0KY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=jcM2WNNbphLEg3JXK4iF+Nrf3+oT4sm0I3j7xlK45xIXwzNtcCGxUMaGFYrMBDfJxj9jqophFvN98OmZIhxM/tb4PHqKMTCFf27taV4qtRy9cPOHoLeXrqPgydmgKcL7DsARC0saBkkbEvhPWb1ZlYAyXdFCULkSg/zeKELHxyo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=VQMCg0lq; arc=none smtp.client-ip=198.175.65.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="VQMCg0lq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743479177; x=1775015177; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=yKQQTJgnlsAt5EUCf0XqaNI7pQyKyO/qu8kMRUmo0KY=; b=VQMCg0lqILn5SfZ+IN1R8rW95OxOzJfrQvpP0RdH9aNR+e7ccIR8iC6u OwsOv8wOv8/7E3bFn16vN1rE9qSD1eQZ3sjYq+m7pTg2ju1Yn4NnCX4Mo lswB42XsCXT66pwaVO7rm/ejd57+GJjTYSE8mE77/Mov0300nL6yaMQiS AHpH5U9+XrHpZS0YiCm6N9QbSOmDsaSUaauUh1lmJRUOo+UKf0rbQa51A voJPt8+oqBDqC6gGFYYGnkRyqmul9+jAYsXegqdUBfwEH8Fia8Qb/KIo6 B3OMjKZ8Qqbs89wVa1F6PCMchHStDAvW+L/H79x7i743Vos2GPRYFZuLZ Q==; X-CSE-ConnectionGUID: 668k3zboSWCQdnNHnCO+ig== X-CSE-MsgGUID: jhK328hNSVmQdQLiONEvbA== X-IronPort-AV: E=McAfee;i="6700,10204,11390"; a="48573172" X-IronPort-AV: E=Sophos;i="6.14,292,1736841600"; d="scan'208";a="48573172" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2025 20:46:16 -0700 X-CSE-ConnectionGUID: ESo07wuBTe+7kNXa8cxJvQ== X-CSE-MsgGUID: ZlF+62pgTU+s3o46zxg0TQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,292,1736841600"; d="scan'208";a="126156059" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2025 20:46:14 -0700 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Yedidya Benshimol Subject: [PATCH wireless 1/2] wifi: iwlwifi: mld: reduce scope for uninitialized variable Date: Tue, 1 Apr 2025 06:45:54 +0300 Message-Id: <20250401064530.769f76a9ad6e.I69e8f194997eb3a20e40d27fdc31002d5753d905@changeid> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Yedidya Benshimol After resuming from D3, keeping the connection or disconnecting isn't relevant for the case of netdetect. Reduce the scope of the keep_connection indicator to wowlan only. Fixes: d1e879ec600f9 ("wifi: iwlwifi: add iwlmld sub-driver") Signed-off-by: Yedidya Benshimol Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/mld/d3.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mld/d3.c b/drivers/net/wireless/intel/iwlwifi/mld/d3.c index 5a7207accd86..2c6e8ecd93b7 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/d3.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/d3.c @@ -1895,7 +1895,6 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld) int link_id; int ret; bool fw_err = false; - bool keep_connection; lockdep_assert_wiphy(mld->wiphy); @@ -1965,7 +1964,7 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld) iwl_mld_process_netdetect_res(mld, bss_vif, &resume_data); mld->netdetect = false; } else { - keep_connection = + bool keep_connection = iwl_mld_process_wowlan_status(mld, bss_vif, resume_data.wowlan_status); @@ -1973,11 +1972,10 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld) if (keep_connection) iwl_mld_unblock_emlsr(mld, bss_vif, IWL_MLD_EMLSR_BLOCKED_WOWLAN); + else + ieee80211_resume_disconnect(bss_vif); } - if (!mld->netdetect && !keep_connection) - ieee80211_resume_disconnect(bss_vif); - goto out; err: From patchwork Tue Apr 1 03:45:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 14034330 X-Patchwork-Delegate: johannes@sipsolutions.net Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 044481386B4 for ; Tue, 1 Apr 2025 03:46:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743479180; cv=none; b=VgkuIUIdIc5rMPgiSuD2eI0IvPJJM2V58GXNR9/cOPL3plQSbHhsHClBgtPUwe/qMs8C0ycM2UVaENoq2tioE9zn+B7tTvxA3kR7UID1DQEAS6AEag1MPCEqoa0juefsCkxyqUH4Xt62M+o3twprpDJWc03a9bid32Q8VpvcEjY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743479180; c=relaxed/simple; bh=XbEPOFo6l0QAGv8KrQmrZCKLXc76zmqX4mpp6JYk/p0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ogFkO4M4taRACCCTC6IEhy4HWKbOF+mATC+2lUzAq1MOPvQFOQkh/h2ZYBCu7h0ttJ9biYg03VxC/xFPI5gn6CBahaOS+1IRxQolW0dRuCixOH5MC9PWtKa45Vg/u1xiPs1CloSFOwKq/7nDuEMhwqgR6eH/70tz4FewTfJJo5Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=K3O1accv; arc=none smtp.client-ip=198.175.65.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="K3O1accv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743479179; x=1775015179; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XbEPOFo6l0QAGv8KrQmrZCKLXc76zmqX4mpp6JYk/p0=; b=K3O1accvgeLXLG67pfNUHoctkHD/5Gb7/nDDJ0UR4EYp4slyKDTQhlXo I0WrVodN/8DYnV8pikqW4+h3T/l03y0gOOI2ou1rCnK9UoTPatv8TJteC KalM5dZEZODp71eMJm5Xk2HxQoQGL27AYoR5clC3DsSAJWcV1Qv2YZ/+z lkFq0QTEiElHBsyMahPkXKMq5AJpN3xRtxb0khsIlfFzIxAJL2NJ4QM/w SxiwWvKvYvhoQSTXY5lRRpdy2w7vfKl+vdXpxXHUdwbfup0kGqYY1NPuq 9REj8TxDEdIMtbCjchuLFoeuDJiBPBe+n/0SEDSM7OXl7WmCZvuN1KFY5 A==; X-CSE-ConnectionGUID: svG5gl04SnGOie0LnaECLQ== X-CSE-MsgGUID: D7J5dxEWTTSPCBvyJRPRdQ== X-IronPort-AV: E=McAfee;i="6700,10204,11390"; a="48573175" X-IronPort-AV: E=Sophos;i="6.14,292,1736841600"; d="scan'208";a="48573175" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2025 20:46:18 -0700 X-CSE-ConnectionGUID: QAJbbBU1RA2SipUro9FqOg== X-CSE-MsgGUID: z3IQ5Y1EQi2k+Kg+vw5gsw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,292,1736841600"; d="scan'208";a="126156067" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2025 20:46:16 -0700 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg , Yedidya Ben Shimol Subject: [PATCH wireless 2/2] wifi: iwlwifi: mld: fix PM_SLEEP -Wundef warning Date: Tue, 1 Apr 2025 06:45:55 +0300 Message-Id: <20250401064530.612020bcdaad.I4e885e6646576e29fb236250a1b5038d3f14b08e@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250401064530.769f76a9ad6e.I69e8f194997eb3a20e40d27fdc31002d5753d905@changeid> References: <20250401064530.769f76a9ad6e.I69e8f194997eb3a20e40d27fdc31002d5753d905@changeid> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Johannes Berg Config symbols are not defined if turned off, so need to use #ifdef, not #if. Fixes: d1e879ec600f9 ("wifi: iwlwifi: add iwlmld sub-driver") Signed-off-by: Johannes Berg Reviewed-by: Yedidya Ben Shimol Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/mld/iface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mld/iface.h b/drivers/net/wireless/intel/iwlwifi/mld/iface.h index d1d56b081bf6..ec14d0736cee 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/iface.h +++ b/drivers/net/wireless/intel/iwlwifi/mld/iface.h @@ -166,7 +166,7 @@ struct iwl_mld_vif { struct iwl_mld_emlsr emlsr; -#if CONFIG_PM_SLEEP +#ifdef CONFIG_PM_SLEEP struct iwl_mld_wowlan_data wowlan_data; #endif #ifdef CONFIG_IWLWIFI_DEBUGFS