Merge tag '5.20-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd

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

diff --git a/net/mac80211/ocb.c b/net/mac80211/ocb.c
index f97cb4c..a57dcbe 100644 (file)
--- a/net/mac80211/ocb.c
+++ b/net/mac80211/ocb.c
@@ -4,6 +4,7 @@
  *
  * Copyright: (c) 2014 Czech Technical University in Prague
  *            (c) 2014 Volkswagen Group Research
+ * Copyright (C) 2022 Intel Corporation
  * Author:    Rostislav Lisovy <rostislav.lisovy@fel.cvut.cz>
  * Funded by: Volkswagen Group Research
  */
@@ -59,7 +60,7 @@ void ieee80211_ocb_rx_no_sta(struct ieee80211_sub_if_data *sdata,
        ocb_dbg(sdata, "Adding new OCB station %pM\n", addr);
 
        rcu_read_lock();
-       chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
+       chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf);
        if (WARN_ON_ONCE(!chanctx_conf)) {
                rcu_read_unlock();
                return;
@@ -180,13 +181,13 @@ int ieee80211_ocb_join(struct ieee80211_sub_if_data *sdata,
        if (ifocb->joined == true)
                return -EINVAL;
 
-       sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE;
-       sdata->smps_mode = IEEE80211_SMPS_OFF;
-       sdata->needed_rx_chains = sdata->local->rx_chains;
+       sdata->deflink.operating_11g_mode = true;
+       sdata->deflink.smps_mode = IEEE80211_SMPS_OFF;
+       sdata->deflink.needed_rx_chains = sdata->local->rx_chains;
 
        mutex_lock(&sdata->local->mtx);
-       err = ieee80211_vif_use_channel(sdata, &setup->chandef,
-                                       IEEE80211_CHANCTX_SHARED);
+       err = ieee80211_link_use_channel(&sdata->deflink, &setup->chandef,
+                                        IEEE80211_CHANCTX_SHARED);
        mutex_unlock(&sdata->local->mtx);
        if (err)
                return err;
@@ -228,7 +229,7 @@ int ieee80211_ocb_leave(struct ieee80211_sub_if_data *sdata)
        ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_OCB);
 
        mutex_lock(&sdata->local->mtx);
-       ieee80211_vif_release_channel(sdata);
+       ieee80211_link_release_channel(&sdata->deflink);
        mutex_unlock(&sdata->local->mtx);
 
        skb_queue_purge(&sdata->skb_queue);