Commit 1e0f8cc9 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: nl80211: use link ID in NL80211_CMD_SET_BSS 



We clearly need the link ID here, to know the right BSS
to configure. Use/require it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f7ee3041

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -2105,6 +2105,7 @@ struct mpath_info { 
 *

 * Used to change BSS parameters (mainly for AP mode).

 *

 * @link_id: link_id or -1 for non-MLD

 * @use_cts_prot: Whether to use CTS protection

 *	(0 = no, 1 = yes, -1 = do not change)

 * @use_short_preamble: Whether the use of short preambles is allowed
@@ -2122,6 +2123,7 @@ struct mpath_info { 
 * @p2p_opp_ps: P2P opportunistic PS (-1 = no change)

 */

struct bss_parameters {

	int link_id;

	int use_cts_prot;

	int use_short_preamble;

	int use_short_slot_time;

net/wireless/nl80211.c

+3 −1
Original line number Diff line number Diff line
@@ -7780,6 +7780,7 @@ static int nl80211_set_bss(struct sk_buff *skb, struct genl_info *info) 
	int err;









	memset(&params, 0, sizeof(params));









	params.link_id = nl80211_link_id_or_invalid(info->attrs);









	/* default to not changing parameters */









	params.use_cts_prot = -1;









	params.use_short_preamble = -1;








@@ -16564,7 +16565,8 @@ static const struct genl_small_ops nl80211_small_ops[] = {







		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,









		.doit = nl80211_set_bss,









		.flags = GENL_UNS_ADMIN_PERM,









		.internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP),









		.internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP |









					 NL80211_FLAG_MLO_VALID_LINK_ID),









	},









	{









		.cmd = NL80211_CMD_GET_REG,