diff options
| author | Shaul Triebitz <shaul.triebitz@intel.com> | 2022-08-02 15:22:42 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-08-25 10:40:55 +0200 |
| commit | 9d2bb84d54a40361c7008b33a60dc24f78724746 (patch) | |
| tree | c56bb57e7020c507b6300e632a5be2b40a7b7839 /net/wireless | |
| parent | d1efad17381bada239a604bec1008572a2607316 (diff) | |
| download | linux-9d2bb84d54a40361c7008b33a60dc24f78724746.tar.gz linux-9d2bb84d54a40361c7008b33a60dc24f78724746.tar.bz2 linux-9d2bb84d54a40361c7008b33a60dc24f78724746.zip | |
wifi: cfg80211: add link id to txq params
The Tx queue parameters are per link, so add the link ID
from nl80211 parameters to the API.
While at it, lock the wdev when calling into the driver
so it (and we) can check the link ID appropriately.
Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 2705e3ee8fc4..e2169c364ae1 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3476,8 +3476,21 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) if (result) goto out; - result = rdev_set_txq_params(rdev, netdev, - &txq_params); + txq_params.link_id = + nl80211_link_id_or_invalid(info->attrs); + + wdev_lock(netdev->ieee80211_ptr); + if (txq_params.link_id >= 0 && + !(netdev->ieee80211_ptr->valid_links & + BIT(txq_params.link_id))) + result = -ENOLINK; + else if (txq_params.link_id >= 0 && + !netdev->ieee80211_ptr->valid_links) + result = -EINVAL; + else + result = rdev_set_txq_params(rdev, netdev, + &txq_params); + wdev_unlock(netdev->ieee80211_ptr); if (result) goto out; } |