Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60b0fa1a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging into staging-next 

* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging

:
  staging: rt2860sta and rt2870sta: Remove drivers replaced in net/wireless

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents 5d46f326 0215c5cf

drivers/staging/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@ source "drivers/staging/echo/Kconfig" 


source "drivers/staging/brcm80211/Kconfig"



source "drivers/staging/rt2860/Kconfig"



source "drivers/staging/rt2870/Kconfig"



source "drivers/staging/comedi/Kconfig"



source "drivers/staging/olpc_dcon/Kconfig"

drivers/staging/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ 
obj-$(CONFIG_ECHO)		+= echo/

obj-$(CONFIG_BRCMSMAC)		+= brcm80211/

obj-$(CONFIG_BRCMFMAC)		+= brcm80211/

obj-$(CONFIG_RT2860)		+= rt2860/

obj-$(CONFIG_RT2870)		+= rt2870/

obj-$(CONFIG_COMEDI)		+= comedi/

obj-$(CONFIG_FB_OLPC_DCON)	+= olpc_dcon/

obj-$(CONFIG_ASUS_OLED)		+= asus_oled/

drivers/staging/rt2860/Kconfig

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
config RT2860

	tristate "Ralink 2860/3090 wireless support"

	depends on PCI && X86 && WLAN

	select WIRELESS_EXT

	select WEXT_PRIV

	select CRC_CCITT

	select FW_LOADER

	---help---

	  This is an experimental driver for the Ralink 2860 and 3090

	  wireless chips.

drivers/staging/rt2860/Makefile

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
obj-$(CONFIG_RT2860)	+= rt2860sta.o



# TODO: all of these should be removed

ccflags-y := -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT

ccflags-y += -DRTMP_MAC_PCI -DRTMP_PCI_SUPPORT -DRT2860

ccflags-y += -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3090

ccflags-y += -DDBG



rt2860sta-y :=	\

	common/crypt_md5.o	\

	common/crypt_sha2.o	\

	common/crypt_hmac.o	\

	common/mlme.o		\

	common/cmm_wep.o	\

	common/action.o		\

	common/cmm_data.o	\

	common/rtmp_init.o	\

	common/cmm_tkip.o	\

	common/cmm_aes.o	\

	common/cmm_sync.o	\

	common/eeprom.o		\

	common/cmm_sanity.o	\

	common/cmm_info.o	\

	common/cmm_cfg.o	\

	common/cmm_wpa.o	\

	common/dfs.o		\

	common/spectrum.o	\

	common/rtmp_timer.o	\

	common/rt_channel.o	\

	common/cmm_asic.o	\

	sta/assoc.o		\

	sta/auth.o		\

	sta/auth_rsp.o		\

	sta/sync.o		\

	sta/sanity.o		\

	sta/rtmp_data.o		\

	sta/connect.o		\

	sta/wpa.o		\

	rt_linux.o		\

	rt_main_dev.o		\

	sta_ioctl.o		\

	common/ba_action.o	\

	pci_main_dev.o		\

	rt_pci_rbus.o		\

	common/cmm_mac_pci.o	\

	common/cmm_data_pci.o	\

	common/ee_prom.o	\

	common/rtmp_mcu.o	\

	common/ee_efuse.o	\

	chips/rt30xx.o		\

	common/rt_rf.o		\

	chips/rt3090.o

drivers/staging/rt2860/TODO

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
I'm hesitant to add a TODO file here, as the wireless developers would

really have people help them out on the "clean" rt2860 driver that can

be found at the http://rt2x00.serialmonkey.com/ site.



But, if you wish to clean up this driver instead, here's a short list of

things that need to be done to get it into a more mergable shape:



TODO:

	- checkpatch.pl clean

	- sparse clean

	- port to in-kernel 80211 stack and common rt2x00 infrastructure

	- review by the wireless developer community



Please send any patches or complaints about this driver to Greg

Kroah-Hartman <greg@kroah.com> and don't bother the upstream wireless

kernel developers about it, they want nothing to do with it.