Skip to content

Commit fea8893

Browse files
torvaldstorvalds
committed
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
2 parents 0448009 + d7216f8 commit fea8893

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+71854
-0
lines changed

‎drivers/staging/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ source "drivers/staging/rtl8712/Kconfig"
5252

5353
source "drivers/staging/rtl8188eu/Kconfig"
5454

55+
source "drivers/staging/rtl8821ae/Kconfig"
56+
5557
source "drivers/staging/rts5139/Kconfig"
5658

5759
source "drivers/staging/rts5208/Kconfig"

‎drivers/staging/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ obj-$(CONFIG_RTL8192U) += rtl8192u/
1818
obj-$(CONFIG_RTL8192E) += rtl8192e/
1919
obj-$(CONFIG_R8712U) += rtl8712/
2020
obj-$(CONFIG_R8188EU) += rtl8188eu/
21+
obj-$(CONFIG_R8821AE) += rtl8821ae/
2122
obj-$(CONFIG_RTS5139) += rts5139/
2223
obj-$(CONFIG_RTS5208) += rts5208/
2324
obj-$(CONFIG_TRANZPORT) += frontier/

‎drivers/staging/rtl8821ae/Kconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
config R8821AE
2+
tristate "RealTek RTL8821AE Wireless LAN NIC driver"
3+
depends on PCI && WLAN
4+
depends on m
5+
select WIRELESS_EXT
6+
select WEXT_PRIV
7+
select EEPROM_93CX6
8+
select CRYPTO
9+
default N
10+
---help---
11+
If built as a module, it will be called r8821ae.ko.

‎drivers/staging/rtl8821ae/Makefile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
PCI_MAIN_OBJS := base.o \
2+
rc.o \
3+
debug.o \
4+
regd.o \
5+
efuse.o \
6+
cam.o \
7+
ps.o \
8+
core.o \
9+
stats.o \
10+
pci.o \
11+
12+
BT_COEXIST_OBJS:= btcoexist/halbtc8192e2ant.o\
13+
btcoexist/halbtc8723b1ant.o\
14+
btcoexist/halbtc8723b2ant.o\
15+
btcoexist/halbtcoutsrc.o\
16+
btcoexist/rtl_btc.o \
17+
18+
PCI_8821AE_HAL_OBJS:= \
19+
rtl8821ae/hw.o \
20+
rtl8821ae/table.o \
21+
rtl8821ae/sw.o \
22+
rtl8821ae/trx.o \
23+
rtl8821ae/led.o \
24+
rtl8821ae/fw.o \
25+
rtl8821ae/phy.o \
26+
rtl8821ae/rf.o \
27+
rtl8821ae/dm.o \
28+
rtl8821ae/pwrseq.o \
29+
rtl8821ae/pwrseqcmd.o \
30+
rtl8821ae/hal_btc.o \
31+
rtl8821ae/hal_bt_coexist.o \
32+
33+
rtl8821ae-objs += $(BT_COEXIST_OBJS) $(PCI_MAIN_OBJS) $(PCI_8821AE_HAL_OBJS)
34+
35+
obj-$(CONFIG_R8821AE) += rtl8821ae.o

‎drivers/staging/rtl8821ae/TODO

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Realtek 8821AE PCI wifi driver TODO:
2+
- remove built-in btcoexist module when the "real" one gets upstream
3+
- remove built-in rtlwifi code by porting driver to use the "real" one
4+
in the drivers/net/ directory.
5+
- fix up coding style issues
6+
7+
Please send any patches for this driver to:
8+
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
9+
and the <devel@driverdev.osuosl.org> mailing list.
10+

0 commit comments

Comments
 (0)