[PATCH 5.14 203/334] mac80211: remove unnecessary NULL check in ieee80211_register_hw()

Greg Kroah-Hartman
2021-09-13T14:41:05Z

From: Dan Carpenter <dan.carpenter@oracle.com>

[ Upstream commit 4a11174d6dbd0bde6d5a1d6efb0d70f58811db55 ]

The address "&sband->iftype_data[i]" points to an array at the end of
struct. It can't be NULL and so the check can be removed.

Fixes: bac2fd3d7534 ("mac80211: remove use of ieee80211_get_he_sta_cap()")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/YNmgHi7Rh3SISdog@mwanda
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/mac80211/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index fcae76ddd586..45fb517591ee 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1020,7 +1020,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)

iftd = &sband->iftype_data[i];

- supp_he = supp_he || (iftd && iftd->he_cap.has_he);
+ supp_he = supp_he || iftd->he_cap.has_he;
}

/* HT, VHT, HE require QoS, thus >= 4 queues */
--
2.30.2