Merge tag 'for-6.0/dm-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / net / mac80211 / driver-ops.c

diff --git a/net/mac80211/driver-ops.c b/net/mac80211/driver-ops.c
index 48322e4..9b61dc7 100644 (file)
--- a/net/mac80211/driver-ops.c
+++ b/net/mac80211/driver-ops.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2015 Intel Deutschland GmbH
+ * Copyright (C) 2022 Intel Corporation
  */
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
@@ -180,9 +181,10 @@ void drv_sta_rc_update(struct ieee80211_local *local,
 }
 
 int drv_conf_tx(struct ieee80211_local *local,
-               struct ieee80211_sub_if_data *sdata, u16 ac,
+               struct ieee80211_link_data *link, u16 ac,
                const struct ieee80211_tx_queue_params *params)
 {
+       struct ieee80211_sub_if_data *sdata = link->sdata;
        int ret = -EOPNOTSUPP;
 
        might_sleep();
@@ -201,10 +203,10 @@ int drv_conf_tx(struct ieee80211_local *local,
                return -EINVAL;
        }
 
-       trace_drv_conf_tx(local, sdata, ac, params);
+       trace_drv_conf_tx(local, sdata, link->link_id, ac, params);
        if (local->ops->conf_tx)
                ret = local->ops->conf_tx(&local->hw, &sdata->vif,
-                                         ac, params);
+                                         link->link_id, ac, params);
        trace_drv_return_int(local, ret);
        return ret;
 }