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

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

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

Pull rtl8812ae staging wireless driver from Greg KH:
 "Here's a single staging driver for a wireless chipset that has shown
  up in the SteamBox hardware.  It is merged separately from the "main"
  staging pull request to sync up with the wireless api changes that
  came in from the networking tree.

  It's self-contained and works for me and others.  Larry will be
  replacing it with a "real" driver for 3.15, but for now this one is
  needed"

* tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: r8821ae: Enable build by reverting BROKEN marking
  staging: r8821ae: Fix build problems
  Staging: rtl8812ae: disable due to build errors
  Staging: rtl8821ae: add TODO file
  Staging: rtl8821ae: removed unused functions and variables
  Staging: rtl8821ae: rc.c: fix up function prototypes
  Staging: rtl8812ae: Add Realtek 8821 PCI WIFI driver
parents 04480094 d7216f8f

drivers/staging/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ source "drivers/staging/rtl8712/Kconfig" 


source "drivers/staging/rtl8188eu/Kconfig"



source "drivers/staging/rtl8821ae/Kconfig"



source "drivers/staging/rts5139/Kconfig"



source "drivers/staging/rts5208/Kconfig"

drivers/staging/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ obj-$(CONFIG_RTL8192U) += rtl8192u/ 
obj-$(CONFIG_RTL8192E)		+= rtl8192e/

obj-$(CONFIG_R8712U)		+= rtl8712/

obj-$(CONFIG_R8188EU)		+= rtl8188eu/

obj-$(CONFIG_R8821AE)		+= rtl8821ae/

obj-$(CONFIG_RTS5139)		+= rts5139/

obj-$(CONFIG_RTS5208)		+= rts5208/

obj-$(CONFIG_TRANZPORT)		+= frontier/

drivers/staging/rtl8821ae/Kconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
config R8821AE

	tristate "RealTek RTL8821AE Wireless LAN NIC driver"

	depends on PCI && WLAN

	depends on m

	select WIRELESS_EXT

	select WEXT_PRIV

	select EEPROM_93CX6

	select CRYPTO

	default N

	---help---

	  If built as a module, it will be called r8821ae.ko.

drivers/staging/rtl8821ae/Makefile

0 → 100644
+35 −0
Original line number Diff line number Diff line 
PCI_MAIN_OBJS	:= base.o	\

		rc.o	\

		debug.o	\

		regd.o	\

		efuse.o	\

		cam.o	\

		ps.o	\

		core.o	\

		stats.o	\

		pci.o	\



BT_COEXIST_OBJS:=	btcoexist/halbtc8192e2ant.o\

			btcoexist/halbtc8723b1ant.o\

			btcoexist/halbtc8723b2ant.o\

			btcoexist/halbtcoutsrc.o\

			btcoexist/rtl_btc.o	\



PCI_8821AE_HAL_OBJS:=	\

	rtl8821ae/hw.o		\

	rtl8821ae/table.o		\

	rtl8821ae/sw.o		\

	rtl8821ae/trx.o		\

	rtl8821ae/led.o		\

	rtl8821ae/fw.o		\

	rtl8821ae/phy.o		\

	rtl8821ae/rf.o		\

	rtl8821ae/dm.o		\

	rtl8821ae/pwrseq.o	\

	rtl8821ae/pwrseqcmd.o	\

	rtl8821ae/hal_btc.o	\

	rtl8821ae/hal_bt_coexist.o	\



rtl8821ae-objs += $(BT_COEXIST_OBJS) $(PCI_MAIN_OBJS) $(PCI_8821AE_HAL_OBJS)



obj-$(CONFIG_R8821AE) += rtl8821ae.o

drivers/staging/rtl8821ae/TODO

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Realtek 8821AE PCI wifi driver TODO:

  - remove built-in btcoexist module when the "real" one gets upstream

  - remove built-in rtlwifi code by porting driver to use the "real" one

    in the drivers/net/ directory.

  - fix up coding style issues



Please send any patches for this driver to:

	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

and the <devel@driverdev.osuosl.org> mailing list.