ml80211: Put wiphy idx to obtain correct country code

If wiphy idx not provided, kernel returns global reg domain when
processing NL80211_CMD_GET_REG. To obtain the correct country code for
the self-managed regulatory cases, put wiphy idx into nl_msg when
sending this command to kernel.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Chenming Huang 2023-03-08 15:39:22 +08:00 committed by Jouni Malinen
parent 1491fc64a8
commit a34b8477a7

View file

@ -1900,6 +1900,16 @@ static int wpa_driver_nl80211_get_country(void *priv, char *alpha2)
return -ENOMEM; return -ENOMEM;
nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_REG); nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_REG);
if (drv->capa.flags & WPA_DRIVER_FLAGS_SELF_MANAGED_REGULATORY) {
/* put wiphy idx to get the interface specific country code
* instead of the global one. */
if (nla_put_u32(msg, NL80211_ATTR_WIPHY, drv->wiphy_idx)) {
nlmsg_free(msg);
return -1;
}
}
alpha2[0] = '\0'; alpha2[0] = '\0';
ret = send_and_recv_msgs(drv, msg, nl80211_get_country, alpha2, ret = send_and_recv_msgs(drv, msg, nl80211_get_country, alpha2,
NULL, NULL); NULL, NULL);