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 0fd29d9..a57dcbe 100644 (file)
--- a/net/mac80211/ocb.c
+++ b/net/mac80211/ocb.c
@@ -69,7 +69,7 @@ void ieee80211_ocb_rx_no_sta(struct ieee80211_sub_if_data *sdata,
        scan_width = cfg80211_chandef_to_scan_width(&chanctx_conf->def);
        rcu_read_unlock();
 
-       sta = sta_info_alloc(sdata, addr, -1, GFP_ATOMIC);
+       sta = sta_info_alloc(sdata, addr, GFP_ATOMIC);
        if (!sta)
                return;
 
@@ -181,12 +181,12 @@ int ieee80211_ocb_join(struct ieee80211_sub_if_data *sdata,
        if (ifocb->joined == true)
                return -EINVAL;
 
-       sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE;
+       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_link_use_channel(sdata->link[0], &setup->chandef,
+       err = ieee80211_link_use_channel(&sdata->deflink, &setup->chandef,
                                         IEEE80211_CHANCTX_SHARED);
        mutex_unlock(&sdata->local->mtx);
        if (err)
@@ -229,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_link_release_channel(sdata->link[0]);
+       ieee80211_link_release_channel(&sdata->deflink);
        mutex_unlock(&sdata->local->mtx);
 
        skb_queue_purge(&sdata->skb_queue);