Commit 13423166 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver fixes and removal from Greg KH:
 "Here are four small staging driver fixes, and one big staging driver
  deletion for 6.3-rc2.

  The fixes are:

   - rtl8192e driver fixes for where the driver was attempting to
     execute various programs directly from the disk for unknown reasons

   - rtl8723bs driver fixes for issues found by Hans in testing

  The deleted driver is the removal of the r8188eu wireless driver as
  now in 6.3-rc1 we have a "real" wifi driver for one that includes
  support for many many more devices than this old driver did. So it's
  time to remove it as it is no longer needed. The maintainers of this
  driver all have acked its removal. Many thanks to them over the years
  for working to clean it up and keep it working while the real driver
  was being developed.

  All of these have been in linux-next this week with no reported
  problems"

* tag 'staging-6.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: r8188eu: delete driver
  staging: rtl8723bs: Pass correct parameters to cfg80211_get_bss()
  staging: rtl8723bs: Fix key-store index handling
  staging: rtl8192e: Remove call_usermodehelper starting RadioPower.sh
  staging: rtl8192e: Remove function ..dm_check_ac_dc_power calling a script
parents d3d0cac6 fdf6c230

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -19864,13 +19864,6 @@ S: Maintained 
W:	http://wiki.laptop.org/go/DCON

F:	drivers/staging/olpc_dcon/









STAGING - REALTEK RTL8188EU DRIVERS









M:	Larry Finger <Larry.Finger@lwfinger.net>









M:	Phillip Potter <phil@philpotter.co.uk>









R:	Pavel Skripkin <paskripkin@gmail.com>









S:	Supported









F:	drivers/staging/r8188eu/

















STAGING - REALTEK RTL8712U DRIVERS









M:	Larry Finger <Larry.Finger@lwfinger.net>









M:	Florian Schilhabel <florian.c.schilhabel@googlemail.com>.

























drivers/staging/Kconfig



+0
−2






























Original line number
Diff line number
Diff line







@@ -36,8 +36,6 @@ source "drivers/staging/rtl8723bs/Kconfig"

















source "drivers/staging/rtl8712/Kconfig"



















source "drivers/staging/r8188eu/Kconfig"



















source "drivers/staging/rts5208/Kconfig"



















source "drivers/staging/octeon/Kconfig"


































drivers/staging/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -8,7 +8,6 @@ obj-$(CONFIG_RTL8192U)		+= rtl8192u/







obj-$(CONFIG_RTL8192E)		+= rtl8192e/









obj-$(CONFIG_RTL8723BS)		+= rtl8723bs/









obj-$(CONFIG_R8712U)		+= rtl8712/









obj-$(CONFIG_R8188EU)		+= r8188eu/









obj-$(CONFIG_RTS5208)		+= rts5208/









obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/









obj-$(CONFIG_VT6655)		+= vt6655/


































drivers/staging/r8188eu/Kconfig
deleted100644 → 0



+0
−16






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









config R8188EU









	tristate "Realtek RTL8188EU Wireless LAN NIC driver"









	depends on WLAN && USB && CFG80211









	depends on m









	select WIRELESS_EXT









	select WEXT_PRIV









	select LIB80211









	select LIB80211_CRYPT_WEP









	select LIB80211_CRYPT_CCMP









	help









	This option adds support for the Realtek RTL8188EU chipset, used in USB









	devices such as the ASUS USB-N10 Nano. This newer driver is based on GitHub









	sources for version v4.1.4_6773.20130222, and contains modifications for









	newer kernel features. If built as a module, it will be called r8188eu.

































drivers/staging/r8188eu/Makefile
deleted100644 → 0



+0
−48






























Original line number
Diff line number
Diff line



















r8188eu-y = \









		hal/HalHWImg8188E_MAC.o \









		hal/HalHWImg8188E_BB.o \









		hal/HalHWImg8188E_RF.o \









		hal/HalPhyRf_8188e.o \









		hal/HalPwrSeqCmd.o \









		hal/Hal8188ERateAdaptive.o \









		hal/hal_intf.o \









		hal/hal_com.o \









		hal/odm.o \









		hal/odm_HWConfig.o \









		hal/odm_RTL8188E.o \









		hal/rtl8188e_cmd.o \









		hal/rtl8188e_dm.o \









		hal/rtl8188e_hal_init.o \









		hal/rtl8188e_phycfg.o \









		hal/rtl8188e_rf6052.o \









		hal/rtl8188e_rxdesc.o \









		hal/rtl8188eu_xmit.o \









		hal/usb_halinit.o \









		hal/usb_ops_linux.o \









		os_dep/ioctl_linux.o \









		os_dep/os_intfs.o \









		os_dep/osdep_service.o \









		os_dep/usb_intf.o \









		os_dep/usb_ops_linux.o \









		core/rtw_ap.o \









		core/rtw_br_ext.o \









		core/rtw_cmd.o \









		core/rtw_efuse.o \









		core/rtw_fw.o \









		core/rtw_ieee80211.o \









		core/rtw_ioctl_set.o \









		core/rtw_iol.o \









		core/rtw_led.o \









		core/rtw_mlme.o \









		core/rtw_mlme_ext.o \









		core/rtw_pwrctrl.o \









		core/rtw_p2p.o \









		core/rtw_recv.o \









		core/rtw_rf.o \









		core/rtw_security.o \









		core/rtw_sta_mgt.o \









		core/rtw_wlan_util.o \









		core/rtw_xmit.o



















obj-$(CONFIG_R8188EU) := r8188eu.o