From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 177123E9C12 for ; Fri, 2 Oct 2026 19:11:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790968280; cv=none; b=EU/BB9np00jb6NR8cqqeNzjgwvOfHt5EdlHnKioND7fXmooKPYsS7x23yhrwnQFDTAa9GIm7vy3mzYwrLE9YJPEm2F7cm6TZX5zoRi1oAUZ+trgJmKPQwdO5H4XGbfUNjd+qLy13+NJQUeZ+ApQN1HdiKOmpdfM0E3U5VXVL7Og= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790968280; c=relaxed/simple; bh=0RY+5h/zu7/yhOnDJV3XxV8qHBqQrPLsYnUFndiFQ7Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B+EyAk1qU0bRbOgFbFOIKtUdhp5vfy/VIF+4qw2arow9P6yabzaka2XjWFq4rznA9jkvh/0oPi7QUkDsksgn5LOH0nvBcLgzo5iS/EVOtZTOwegJYAKj4tdP0DgBVMX6CbOo3zFJieNwYPznc3rPF2IjE1gEsGt2Q4a2+qiLNOE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=hzYD8kuo; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=DhRUpMyb; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="hzYD8kuo"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="DhRUpMyb" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 692H682O671044 for ; Fri, 2 Oct 2026 19:11:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= uuMxPdvGxWc1nGfBGBs+8fEcCV1kypQ35Wv71IAG3eI=; b=hzYD8kuo6vbBFU61 pWO7vg+b43CUgV20izONEHJIZMMm9EOvBpCZGqqtwiLO15rbhnnu2r+d2SxaMwt0 zQvgA6tOKd9tN5lXeUWh5ITnpd4vP6TTElMEnS4E2YcIciw8faNn0QjuCHpok6Lt UVBn8g8XVHDsOqVjUr4eoIfTMxhPo9h9LAgPxXezubLCn++zohRbGjBCqeI37BnR ATE7zYW3ju4mOS5pL00tkgQAreKUxpajS2kMQB4EsiD6rWjozPZoJ1d9Mpn2KF9W JVrXLdyrgtS/SILQiwcWuJyfXNKEahO/DfMxcZZkArgQZKDfjI3eNFBFJuRTjLVw ZM0BcQ== Received: from mail-dy1-f199.google.com (mail-dy1-f199.google.com [74.125.82.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4h1vxecqn9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 02 Oct 2026 19:11:12 +0000 (GMT) Received: by mail-dy1-f199.google.com with SMTP id 5a478bee46e88-3510d0baf63so724210eec.1 for ; Fri, 02 Oct 2026 12:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1790968272; x=1791573072; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=uuMxPdvGxWc1nGfBGBs+8fEcCV1kypQ35Wv71IAG3eI=; b=DhRUpMyb9rOWUQz5PLxZOez30BKtiWYW50Oj4lbcOP+Ebgo8eZPbLrrfOPxddpkar9 0rsHRp65PGYLjv/HL7h8T3nNhIQe0nGmW+ryf7a27gVHZrZ4/zJNckdNj5cmHSsMNMAu 3Su5VS1GQHEcicsSOUJSSRAwiO5Zy2CI8qfGwlsRHjoQnHMY404I1UlM/POspFQFo4tu +fE8Kg26GGZle7dZFVqIG8ZcETBSOiqNOCGlw0l7KbPkTUrNj8ZDKcqJPFqaU7V7Rz2W AETAqVc2D+4OnMWC7p7L8PKI3D2v9b1G9vuZBYih5JxagEocZ9IUbwaJv7chyJyFy0p0 xw/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790968272; x=1791573072; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=uuMxPdvGxWc1nGfBGBs+8fEcCV1kypQ35Wv71IAG3eI=; b=O0yTJcpy2Bogza7SaGS6ijGWyHPzOhLd+ExrX3/X/zdU8IpBUh4ftrrEClU37dx1Q9 rY1H7U9jkvnVT05MmBxPNDxrwBsxbTrRhV0usv1tHx1PCDOJlVUUgOqJU0H+GYSBtICZ HJyjNSqIL4T2iIANuVPNlxcKFVMU2Ivnojdf/TQyGYKxJJ9R0dueYVuXg7Suy2o1rcOC duaVlqvsj8H/+IhzTdx+eBn4UC/wRkEovp63T5+MIqKGp4IWaHiPdkY6owxHwOpZra5i TWp5ALtebFGnBoALSf17DyCT6IwAMlF73m/n9kXtMGLm8c7X4vqaBnNO0CzRy+YOSudd DekQ== X-Gm-Message-State: AFuF++mh7E2m8mLyZnVYdiXurzr5ipvYaqGakUUQJ4nYbnEHJaS9q64s fZmQaWzPNb4MGPCVOQOxr82NY6XUclT+kcyyNl7R/vCm+iyp4SxxnlVPT3O/Ru2zB09jjfll1VK vgT/Xu1UibDzbJqabq+imQEJTovSfX2n3+ya7kM6dmbLEszXobQsETOm2ANWEWWSuZvvoyA== X-Gm-Gg: AYBFou3W9BhvtiDzfaLcYeqMqaaSGs/SSt7IMES8fsZX7j6HZOxw5Lxtn/0XlPd6hYI fjkhxHjXKOfFXdXElcFTdqi/cUs3eOnagUYLm60bNvbfh9t63QGElWZwD0/mxiaJUuVFuUQ5DDb n+EZ6V/bnkGwn4v0uOreB26mJtGkEziOyRNkJpBdNmolSHZaLh+E96rD2QPVNjgXlzsFuCRreDk 07PHqu6xd5P4bAnUV0vPvrMlb+QFnzsNnIQAAe88cvjnC7wui9Q6XhkiYcrPAriWU9bqFvUHBrJ /nazpaIFuC+txh8gOAog8+9NrrGy/UVJ8fTU9h5/dUaEC+KaSq5yDfDnBt8tmHQrrYk0BwXWfD/ lKVeYWYloxCSH4Orhh30yfLCqsEZewCMpYhCaMiV6yw56Sv4yIGFuZ3Q= X-Received: by 2002:a05:693c:400b:b0:34a:c4e6:27c with SMTP id 5a478bee46e88-3511143ec5fmr585731eec.18.1790968271589; Fri, 02 Oct 2026 12:11:11 -0700 (PDT) X-Received: by 2002:a05:693c:400b:b0:34a:c4e6:27c with SMTP id 5a478bee46e88-3511143ec5fmr585701eec.18.1790968270979; Fri, 02 Oct 2026 12:11:10 -0700 (PDT) Received: from alokad-linux.qualcomm.com (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-35105dd1dfasm5263296eec.8.2026.10.02.12.11.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2026 12:11:10 -0700 (PDT) From: Aloka Dixit Date: Fri, 02 Oct 2026 12:10:57 -0700 Subject: [PATCH wireless-next 2/2] wifi: mac80211: remove redundant null check in ieee80211_assign_beacon() Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261002-csa_cca_fix-v1-2-b83a998aeb44@oss.qualcomm.com> References: <20261002-csa_cca_fix-v1-0-b83a998aeb44@oss.qualcomm.com> In-Reply-To: <20261002-csa_cca_fix-v1-0-b83a998aeb44@oss.qualcomm.com> To: Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Aloka Dixit X-Mailer: b4 0.15.2 X-Authority-Analysis: v=2.4 cv=fdc4WEQF c=1 sm=1 tr=0 ts=6ac001d0 cx=c_pps a=cFYjgdjTJScbgFmBucgdfQ==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=IkcTkHD0fZMA:10 a=660iZSQnnn4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=QPPESg7f5PRtYPC1LuQA:9 a=QEXdDO2ut3YA:10 a=scEy_gLbYbu1JhEsrz4S:22 X-Proofpoint-GUID: x2dx5VP747s1ejWSsgpDYEtCl4SwGh6R X-Proofpoint-ORIG-GUID: x2dx5VP747s1ejWSsgpDYEtCl4SwGh6R X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDAyMDA3NiBTYWx0ZWRfX9sLzcpaN7yhu k3j9DWwCu/wh2Fmd9SmY/wkrXfii61/gcfUnPYiRWaEzMdvvjVPtAQhM1vfjo3ErFhOM18qlK69 JUYoiPuI3Rk4P8vH8SsC9tRVS32+GKEW86Rur/XfvrIsUlxAgA64UZxnzQ3OhYw2/mwjOGzDqLf 44RDSCyW02rivXeOs7AupFNRmezFUUWAhOXIT4VSpiE2MIDfK4N0qXeefcH1Af+2HEL+2RRSmG1 QvAfqZY4A0ZAAxB5ywT8Q0K/d+Ck8rQm3FzKqrFPMU37+Boo24lKwcPGXTfO1zUCyHrTKs20zNb 1AmiFNcH9dC2u2VuxCSttwiYozpgVkcRMf+Z62nwjdqeTwcUtjzVwd27nTkm5rJkcm9YbnCtFfH KuketHuwy2gn7dPbo5ewzi/Tw4Kc03PzCeGQAXYZcIkHxZbOKhdk5FATOS7RpGsfdMsCESBhgz5 l1f+/VzKuYG8ly4UIVw== X-Proofpoint-Spam-Info: AW1haW4tMjYxMDAyMDA3NiBTYWx0ZWRfX9rMvjXG5yrFS L8+xtrGsEIk2aAhr0OeaMrw5gtkxwGbYOU8LLUkl5li5dCcgNXGLhN509SBUojMWIpmTCgEI3un 7QFby2Ls+jeWa8KDN8gbJM0m2JzVJnk= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-10-02_05,2026-10-02_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 impostorscore=0 bulkscore=0 clxscore=1011 priorityscore=1501 suspectscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2610020076 The else-if branch condition 'old && old->mbssid_ies' already guarantees 'old' is non-NULL. The inner 'old &&' in 'if (old && old->rnr_ies)' is therefore redundant; remove it. Signed-off-by: Aloka Dixit --- net/mac80211/cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index b38941e6784f..cd5781ba2873 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1531,7 +1531,7 @@ ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, } else if (old && old->mbssid_ies) { mbssid = old->mbssid_ies; size += struct_size(new->mbssid_ies, elem, mbssid->cnt); - if (old && old->rnr_ies) { + if (old->rnr_ies) { rnr = old->rnr_ies; size += struct_size(new->rnr_ies, elem, rnr->cnt); } -- 2.34.1