From: Aloka Dixit <aloka.dixit@oss.qualcomm.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
Aloka Dixit <aloka.dixit@oss.qualcomm.com>
Subject: [PATCH wireless-next 2/2] wifi: mac80211: remove redundant null check in ieee80211_assign_beacon()
Date: Fri, 02 Oct 2026 12:10:57 -0700 [thread overview]
Message-ID: <20261002-csa_cca_fix-v1-2-b83a998aeb44@oss.qualcomm.com> (raw)
In-Reply-To: <20261002-csa_cca_fix-v1-0-b83a998aeb44@oss.qualcomm.com>
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 <aloka.dixit@oss.qualcomm.com>
---
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
prev parent reply other threads:[~2026-10-02 19:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-02 19:10 [PATCH wireless-next 0/2] wifi: mac80211: fix CSA/CCA regression Aloka Dixit
2026-10-02 19:10 ` [PATCH wireless-next 1/2] Revert "wifi: mac80211: do not use old MBSSID elements" Aloka Dixit
2026-10-02 19:10 ` Aloka Dixit [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261002-csa_cca_fix-v1-2-b83a998aeb44@oss.qualcomm.com \
--to=aloka.dixit@oss.qualcomm.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®