wifi: nl80211: split helper function from nl80211_put_iface_combinations

Create a helper function that puts the data from struct
ieee80211_iface_combination to a nl80211 message.
This will be used for adding per-radio interface combination data.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://patch.msgid.link/22a0eee19dbcf98627239328bc66decd3395122c.1719919832.git-series.nbd@nbd.nameSigned-off-by: Johannes Berg <johannes.berg@intel.com>

net/wireless/nl80211.c

@@ -1631,44 +1631,30 @@ static int nl80211_put_iftypes(struct sk_buff *msg, u32 attr, u16 ifmodes)
 	return -ENOBUFS;
 }
 
-static int nl80211_put_iface_combinations(struct wiphy *wiphy,
-					  struct sk_buff *msg,
-					  bool large)
+static int nl80211_put_ifcomb_data(struct sk_buff *msg, bool large, int idx,
+				   const struct ieee80211_iface_combination *c)
 {
-	struct nlattr *nl_combis;
-	int i, j;
-
-	nl_combis = nla_nest_start_noflag(msg,
-					  NL80211_ATTR_INTERFACE_COMBINATIONS);
-	if (!nl_combis)
-		goto nla_put_failure;
-
-	for (i = 0; i < wiphy->n_iface_combinations; i++) {
-		const struct ieee80211_iface_combination *c;
 	struct nlattr *nl_combi, *nl_limits;
+	int i;
 
-		c = &wiphy->iface_combinations[i];
-
-		nl_combi = nla_nest_start_noflag(msg, i + 1);
+	nl_combi = nla_nest_start_noflag(msg, idx);
 	if (!nl_combi)
 		goto nla_put_failure;
 
-		nl_limits = nla_nest_start_noflag(msg,
-						  NL80211_IFACE_COMB_LIMITS);
+	nl_limits = nla_nest_start_noflag(msg, NL80211_IFACE_COMB_LIMITS);
 	if (!nl_limits)
 		goto nla_put_failure;
 
-		for (j = 0; j < c->n_limits; j++) {
+	for (i = 0; i < c->n_limits; i++) {
 		struct nlattr *nl_limit;
 
-			nl_limit = nla_nest_start_noflag(msg, j + 1);
+		nl_limit = nla_nest_start_noflag(msg, i + 1);
 		if (!nl_limit)
 			goto nla_put_failure;
-			if (nla_put_u32(msg, NL80211_IFACE_LIMIT_MAX,
-					c->limits[j].max))
+		if (nla_put_u32(msg, NL80211_IFACE_LIMIT_MAX, c->limits[i].max))
 			goto nla_put_failure;
 		if (nl80211_put_iftypes(msg, NL80211_IFACE_LIMIT_TYPES,
-						c->limits[j].types))
+					c->limits[i].types))
 			goto nla_put_failure;
 		nla_nest_end(msg, nl_limit);
 	}
@@ -1695,7 +1681,28 @@ static int nl80211_put_iface_combinations(struct wiphy *wiphy,
 		goto nla_put_failure;
 
 	nla_nest_end(msg, nl_combi);
-	}
+
+	return 0;
+nla_put_failure:
+	return -ENOBUFS;
+}
+
+static int nl80211_put_iface_combinations(struct wiphy *wiphy,
+					  struct sk_buff *msg,
+					  bool large)
+{
+	struct nlattr *nl_combis;
+	int i;
+
+	nl_combis = nla_nest_start_noflag(msg,
+					  NL80211_ATTR_INTERFACE_COMBINATIONS);
+	if (!nl_combis)
+		goto nla_put_failure;
+
+	for (i = 0; i < wiphy->n_iface_combinations; i++)
+		if (nl80211_put_ifcomb_data(msg, large, i + 1,
+					    &wiphy->iface_combinations[i]))
+			goto nla_put_failure;
 
 	nla_nest_end(msg, nl_combis);