From: Johannes Berg Date: Thu, 2 Jan 2025 14:20:02 +0000 (+0200) Subject: wifi: nl80211: simplify nested if checks X-Git-Tag: v6.14-rc1~162^2~20^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb54c93bd37541424505281e09fffe75ab3357e9;p=thirdparty%2Fkernel%2Flinux.git wifi: nl80211: simplify nested if checks In the absence of (an) else clause(s), "if (a) if (b)" is equivalent to "if (a && b)", so simplify the code a bit. Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20250102161730.c8bf7338aa64.Ie49dcc1ba44b507d91d5a9d8bd538d7ac2e46c54@changeid Signed-off-by: Johannes Berg --- diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 351b863623afc..d7d3da0f6833d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -18537,10 +18537,9 @@ void nl80211_send_port_authorized(struct cfg80211_registered_device *rdev, nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, peer_addr)) goto nla_put_failure; - if ((td_bitmap_len > 0) && td_bitmap) - if (nla_put(msg, NL80211_ATTR_TD_BITMAP, - td_bitmap_len, td_bitmap)) - goto nla_put_failure; + if (td_bitmap_len > 0 && td_bitmap && + nla_put(msg, NL80211_ATTR_TD_BITMAP, td_bitmap_len, td_bitmap)) + goto nla_put_failure; genlmsg_end(msg, hdr);