]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: nl80211: simplify nested if checks
authorJohannes Berg <johannes.berg@intel.com>
Thu, 2 Jan 2025 14:20:02 +0000 (16:20 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 13 Jan 2025 14:34:09 +0000 (15:34 +0100)
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 <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250102161730.c8bf7338aa64.Ie49dcc1ba44b507d91d5a9d8bd538d7ac2e46c54@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/nl80211.c

index 351b863623afce8fbb0ebb079908cf0997f27a0d..d7d3da0f6833d5c0db79777cb85b58bb87c47efa 100644 (file)
@@ -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);