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

Commit 0afccc4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more staging patches from Greg KH:
 "Here are some more staging patches for 3.15-rc1.

  They include a late-submission of a wireless driver that a bunch of
  people seem to have the hardware for now.  As it's stand-alone, it
  should be fine (now passes the 0-day random build bot tests).

  There are also some fixes for the unisys drivers, as they were causing
  havoc on a number of different machines.  To resolve all of those
  issues, we just mark the driver as BROKEN now, and we can fix it up
  "properly" over time"

* tag 'staging-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8723au: The 8723 only has two paths
  Staging: unisys: mark drivers as BROKEN
  Staging: unisys: verify that a control channel exists
  staging: unisys: Add missing close parentheses in filexfer.c
  staging: r8723au: Fix build problem when RFKILL is not selected
  staging: r8723au: Fix randconfig build errors
  staging: r8723au: Turn on build of new driver
  staging: r8723au: Additional source patches
  staging: r8723au: Add source files for new driver - part 4
  staging: r8723au: Add source files for new driver - part 3
  staging: r8723au: Add source files for new driver - part 2
  staging: r8723au: Add source files for new driver - part 1
parents e4f30545 dda26427

drivers/staging/Kconfig

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


source "drivers/staging/rtl8188eu/Kconfig"



source "drivers/staging/rtl8723au/Kconfig"



source "drivers/staging/rtl8821ae/Kconfig"



source "drivers/staging/rts5139/Kconfig"

drivers/staging/Makefile

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

obj-$(CONFIG_R8712U)		+= rtl8712/

obj-$(CONFIG_R8188EU)		+= rtl8188eu/

obj-$(CONFIG_R8723AU)		+= rtl8723au/

obj-$(CONFIG_R8821AE)		+= rtl8821ae/

obj-$(CONFIG_RTS5139)		+= rts5139/

obj-$(CONFIG_RTS5208)		+= rts5208/

drivers/staging/rtl8723au/Kconfig

0 → 100644
+38 −0
Original line number Diff line number Diff line 
config R8723AU

	tristate "Realtek RTL8723AU Wireless LAN NIC driver"

	depends on USB && WLAN && RFKILL

	select WIRELESS_EXT

	select WEXT_PRIV

	select CFG80211

	default n

	---help---

	This option adds the Realtek RTL8723AU USB device such as found in

	the Lenovo Yogi 13 tablet. If built as a module, it will be called r8723au.



if R8723AU



config 8723AU_AP_MODE

	bool "Realtek RTL8723AU AP mode"

	default y

	---help---

	This option enables Access Point mode. Unless you know that your system

	will never be used as an AP, or the target system has limited memory,

	"Y" should be selected.



config 8723AU_P2P

	bool "Realtek RTL8723AU Peer-to-peer mode"

	default y

	---help---

	This option enables peer-to-peer mode for the r8723au driver. Unless you

	know that peer-to-peer (P2P) mode will never be used, or the target system has

	limited memory, "Y" should be selected.



config 8723AU_BT_COEXIST

	bool "Realtek RTL8723AU BlueTooth Coexistence"

	default y

	---help---

	This option enables icoexistence with BlueTooth communications for the r8723au driver.

	Unless you know that this driver will never by used with BT, or the target system has

	limited memory, "Y" should be selected.



endif

drivers/staging/rtl8723au/Makefile

0 → 100644
+58 −0
Original line number Diff line number Diff line 
r8723au-y :=				\

		core/rtw_ap.o		\

		core/rtw_cmd.o		\

		core/rtw_efuse.o	\

		core/rtw_io.o		\

		core/rtw_ioctl_set.o	\

		core/rtw_ieee80211.o	\

		core/rtw_led.o		\

		core/rtw_mlme.o		\

		core/rtw_mlme_ext.o	\

		core/rtw_p2p.o		\

		core/rtw_pwrctrl.o	\

		core/rtw_recv.o		\

		core/rtw_security.o	\

		core/rtw_sreset.o	\

		core/rtw_sta_mgt.o	\

		core/rtw_xmit.o		\

		core/rtw_wlan_util.o	\

		hal/hal_com.o		\

		hal/hal_intf.o		\

		hal/Hal8723PwrSeq.o	\

		hal/Hal8723UHWImg_CE.o	\

		hal/HalDMOutSrc8723A_CE.o \

		hal/HalHWImg8723A_BB.o	\

		hal/HalHWImg8723A_MAC.o	\

		hal/HalHWImg8723A_RF.o	\

		hal/HalPwrSeqCmd.o	\

		hal/odm_RegConfig8723A.o \

		hal/rtl8723a_bt-coexist.o \

		hal/odm_debug.o		\

		hal/odm_interface.o	\

		hal/odm_HWConfig.o	\

		hal/odm.o		\

		hal/rtl8723a_cmd.o	\

		hal/rtl8723a_dm.o	\

		hal/rtl8723a_hal_init.o	\

		hal/rtl8723a_phycfg.o	\

		hal/rtl8723a_rf6052.o	\

		hal/rtl8723a_rxdesc.o	\

		hal/rtl8723a_sreset.o	\

		hal/rtl8723a_xmit.o	\

		hal/rtl8723au_led.o	\

		hal/rtl8723au_recv.o	\

		hal/rtl8723au_xmit.o	\

		hal/usb_halinit.o	\

		hal/usb_ops_linux.o	\

		os_dep/ioctl_cfg80211.o	\

		os_dep/mlme_linux.o	\

		os_dep/osdep_service.o	\

		os_dep/os_intfs.o	\

		os_dep/recv_linux.o	\

		os_dep/usb_intf.o	\

		os_dep/usb_ops_linux.o	\

		os_dep/xmit_linux.o



obj-$(CONFIG_R8723AU)	:= r8723au.o



ccflags-y += -D__CHECK_ENDIAN__ -I$(src)/include

drivers/staging/rtl8723au/TODO

0 → 100644
+13 −0
Original line number Diff line number Diff line 
TODO:

- find and remove code valid only for 5 HGz. Many of the obvious

  ones have been removed, but things like channel > 14 still exist.

- find and remove any code for other chips that is left over

- convert any remaining unusual variable types

- find codes that can use %pM and %Nph formatting

- checkpatch.pl fixes - most of the remaining ones are lines too long. Many

  of them will require refactoring

- merge Realtek's bugfixes and new features into the driver

- switch to use MAC80211



Please send any patches to Greg Kroah-Hartman <gregkh@linux.com>,

Jes Sorensen <Jes.Sorensen@redhat.com>, and Larry Finger <Larry.Finger@lwfinger.net>.