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>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 908d5839348434dfbc1f5f07958ade2aa4351428..1d393e09a6324e5790cf94fd6d89aa6c146500e1 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2316,6 +2316,7 @@ struct ocb_setup {
  * @cwmax: Maximum contention window [a value of the form 2^n-1 in the range
  *     1..32767]
  * @aifs: Arbitration interframe space [0..255]
+ * @link_id: link_id or -1 for non-MLD
  */
 struct ieee80211_txq_params {
        enum nl80211_ac ac;
@@ -2323,6 +2324,7 @@ struct ieee80211_txq_params {
        u16 cwmin;
        u16 cwmax;
        u8 aifs;
+       int link_id;
 };
 
 /**

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 2705e3ee8fc4e83eebc4d9a43dd23b070cace22b..e2169c364ae1b1022e59a905dbf3a5464d1797f3 100644 (file)
--- 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;
                }