From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Jun 2022 17:44:43 +0000 (-0700)
Subject: Merge tag 'staging-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: baikal/aarch64/sdk6.1~3823
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=49983e435e3e84a049192c7acc548ee417c6a509;p=kernel.git

Merge tag 'staging-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver updates from Greg KH:
 "Here is the big set of staging driver updates for 5.19-rc1.

  Lots of forward progress happened this development cycle, one driver
  (wfx wireless driver) got merged into the real portion of the kernel,
  and another one (unisys) was removed as no one is around anymore to
  take care of it and no one has the hardware. Combined with loads of
  tiny driver cleanups overall we removed 13k lines of code from the
  tree, a nice improvement.

  Other than the wfx and unisys driver changes the major points of this
  merge is:

   - r8188eu driver cleanups. So many cleanups. It's amazing just how
     many things have been cleaned up here, and yet, how many remain to
     go. Lots of work happened here, and it doesn't look to slow down
     any time soon.

   - other wifi driver cleanups. Not as many as the r8188eu driver, but
     still pretty impressive from a janitorial point of view.

   - bcm2853 driver cleanups

   - other very minor driver cleanups

  All of these have been in the linux-next tree for weeks with no
  reported issues"

* tag 'staging-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (363 commits)
  staging: r8188eu: remove include/rtw_debug.h
  staging: r8188eu: prevent ->Ssid overflow in rtw_wx_set_scan()
  staging: r8188eu: delete rtw_wx_read/write32()
  staging: r8188eu: Remove multiple assignments
  staging: r8188eu: add check for kzalloc
  staging: r8188eu: fix warnings in rtw_wlan_util
  staging: r8188eu: fix warnings in rtw_pwrctrl
  staging: r8188eu: fix warnings in rtw_p2p
  staging: rtl8712: fix uninit-value in r871xu_drv_init()
  staging: rtl8712: fix uninit-value in usb_read8() and friends
  staging: rtl8712: add error handler in r8712_usbctrl_vendorreq()
  staging: r8188eu: remove _drv_ defines from include/rtw_debug.h
  staging: vc04_services: remove unused macro
  staging: rtl8192u: remove null check after call container_of()
  staging: rtl8192e: remove null check after call container_of()
  staging: ks7010: remove null check after call container_of()
  staging: r8188eu: remove HW_VAR_AC_PARAM_BE from SetHwReg8188EU()
  staging: r8188eu: assoc_rsp and assoc_rsp_len are not used
  staging: r8188eu: last_rx_mgnt_pkts is set but not used
  staging: r8188eu: simplify error handling in recv_func_prehandle
  ...
---

49983e435e3e84a049192c7acc548ee417c6a509
diff --cc drivers/net/wireless/silabs/wfx/sta.c
index e551fa284a437,03025ef7f1beb..329d7f4a2b2ef
--- a/drivers/net/wireless/silabs/wfx/sta.c
+++ b/drivers/net/wireless/silabs/wfx/sta.c
@@@ -405,13 -388,12 +405,13 @@@ void wfx_stop_ap(struct ieee80211_hw *h
  
  static void wfx_join(struct wfx_vif *wvif)
  {
 -	int ret;
 -	struct ieee80211_bss_conf *conf = &wvif->vif->bss_conf;
 +	struct ieee80211_vif *vif = wvif_to_vif(wvif);
 +	struct ieee80211_bss_conf *conf = &vif->bss_conf;
  	struct cfg80211_bss *bss = NULL;
  	u8 ssid[IEEE80211_MAX_SSID_LEN];
- 	const u8 *ssidie = NULL;
- 	int ssidlen = 0;
+ 	const u8 *ssid_ie = NULL;
+ 	int ssid_len = 0;
 +	int ret;
  
  	wfx_tx_lock_flush(wvif->wdev);
  
@@@ -436,9 -418,9 +436,9 @@@
  	cfg80211_put_bss(wvif->wdev->hw->wiphy, bss);
  
  	wvif->join_in_progress = true;
- 	ret = wfx_hif_join(wvif, conf, wvif->channel, ssid, ssidlen);
+ 	ret = wfx_hif_join(wvif, conf, wvif->channel, ssid, ssid_len);
  	if (ret) {
 -		ieee80211_connection_loss(wvif->vif);
 +		ieee80211_connection_loss(vif);
  		wfx_reset(wvif);
  	} else {
  		/* Due to beacon filtering it is possible that the AP's beacon is not known for the