From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 19 Jul 2022 06:44:25 +0000 (+0200)
Subject: wifi: nl80211: require MLD address on link STA add/modify
X-Git-Tag: v6.0-rc1~141^2~64^2~24
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8876c67e6296b44c283cd748d4888788af3f7942;p=tomoyo%2Ftomoyo-test1.git

wifi: nl80211: require MLD address on link STA add/modify

We always need the MLD address and link ID to add or
modify the link STA, so require it in the API.

Fixes: 577e5b8c3924 ("wifi: cfg80211: add API to add/modify/remove a link station")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index b6e640437568..310d22b263d1 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -15827,14 +15827,13 @@ nl80211_add_mod_link_station(struct sk_buff *skb, struct genl_info *info,
 	if (add && !info->attrs[NL80211_ATTR_MAC])
 		return -EINVAL;
 
-	if (add && !info->attrs[NL80211_ATTR_MLD_ADDR])
+	if (!info->attrs[NL80211_ATTR_MLD_ADDR])
 		return -EINVAL;
 
 	if (add && !info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES])
 		return -EINVAL;
 
-	if (info->attrs[NL80211_ATTR_MLD_ADDR])
-		params.mld_mac = nla_data(info->attrs[NL80211_ATTR_MLD_ADDR]);
+	params.mld_mac = nla_data(info->attrs[NL80211_ATTR_MLD_ADDR]);
 
 	if (info->attrs[NL80211_ATTR_MAC]) {
 		params.link_mac = nla_data(info->attrs[NL80211_ATTR_MAC]);