mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
wifi: nl80211: hold wdev mutex for channel switch APIs
Since we deal with links in an MLD here, hold the wdev mutex now. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
858fd1880b
commit
4e2f3d67e3
1 changed files with 16 additions and 5 deletions
|
@ -3348,8 +3348,13 @@ static int nl80211_set_channel(struct sk_buff *skb, struct genl_info *info)
|
||||||
struct cfg80211_registered_device *rdev = info->user_ptr[0];
|
struct cfg80211_registered_device *rdev = info->user_ptr[0];
|
||||||
int link_id = nl80211_link_id_or_invalid(info->attrs);
|
int link_id = nl80211_link_id_or_invalid(info->attrs);
|
||||||
struct net_device *netdev = info->user_ptr[1];
|
struct net_device *netdev = info->user_ptr[1];
|
||||||
|
int ret;
|
||||||
|
|
||||||
return __nl80211_set_channel(rdev, netdev, info, link_id);
|
wdev_lock(netdev->ieee80211_ptr);
|
||||||
|
ret = __nl80211_set_channel(rdev, netdev, info, link_id);
|
||||||
|
wdev_unlock(netdev->ieee80211_ptr);
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
|
static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
|
||||||
|
@ -3461,10 +3466,16 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
|
if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
|
||||||
|
if (wdev) {
|
||||||
|
wdev_lock(wdev);
|
||||||
result = __nl80211_set_channel(
|
result = __nl80211_set_channel(
|
||||||
rdev,
|
rdev,
|
||||||
nl80211_can_set_dev_channel(wdev) ? netdev : NULL,
|
nl80211_can_set_dev_channel(wdev) ? netdev : NULL,
|
||||||
info, -1);
|
info, -1);
|
||||||
|
wdev_unlock(wdev);
|
||||||
|
} else {
|
||||||
|
result = __nl80211_set_channel(rdev, netdev, info, -1);
|
||||||
|
}
|
||||||
if (result)
|
if (result)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue