---

yaml --- r: 281192 b: refs/heads/master c: 3d461c9 h: refs/heads/master v: v3
git-mirror · Nov 30, 2011 · a99f67a · a99f67a
1 parent f5dc013
commit a99f67a
Show file tree

Hide file tree

Showing 40 changed files with 39 additions and 33 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d37e0208df563af9c6fada84e620aabed581b3a8
+refs/heads/master: 3d461c912462b6b36ff9cf2c2f605ef37aeab438
diff --git a/trunk/drivers/staging/rtl8192e/Kconfig b/trunk/drivers/staging/rtl8192e/Kconfig
@@ -8,6 +8,8 @@ config RTLLIB
 
 	  If unsure, say N.
 
+if RTLLIB
+
 config RTLLIB_CRYPTO
 	tristate "Support for rtllib crypto support"
 	depends on RTLLIB
@@ -44,12 +46,6 @@ config RTLLIB_CRYPTO_WEP
 
 	  If you enabled RTLLIB, you want this.
 
-config RTL8192E
-	tristate "RealTek RTL8192E Wireless LAN NIC driver"
-	depends on PCI && WLAN && RTLLIB
-	depends on m
-	select WIRELESS_EXT
-	select WEXT_PRIV
-	select CRYPTO
-	default N
-	---help---
+source "drivers/staging/rtl8192e/rtl8192e/Kconfig"
+
+endif
diff --git a/trunk/drivers/staging/rtl8192e/Makefile b/trunk/drivers/staging/rtl8192e/Makefile
@@ -17,24 +17,6 @@ obj-$(CONFIG_RTLLIB_CRYPTO_CCMP) += rtllib_crypt_ccmp.o
 obj-$(CONFIG_RTLLIB_CRYPTO_TKIP) += rtllib_crypt_tkip.o
 obj-$(CONFIG_RTLLIB_CRYPTO_WEP) += rtllib_crypt_wep.o
 
-r8192e_pci-objs :=		\
-	r8192E_dev.o		\
-	r8192E_phy.o		\
-	r8192E_firmware.o	\
-	r8192E_cmdpkt.o		\
-	r8192E_hwimg.o		\
-	r8190P_rtl8256.o	\
-	rtl_cam.o		\
-	rtl_core.o		\
-	rtl_debug.o		\
-	rtl_dm.o		\
-	rtl_eeprom.o		\
-	rtl_ethtool.o		\
-	rtl_pci.o		\
-	rtl_pm.o		\
-	rtl_ps.o		\
-	rtl_wx.o		\
-
-obj-$(CONFIG_RTL8192E) += r8192e_pci.o
+obj-$(CONFIG_RTL8192E) += rtl8192e/
 
 ccflags-y += -D__CHECK_ENDIAN__
diff --git a/trunk/drivers/staging/rtl8192e/rtl8192e/Kconfig b/trunk/drivers/staging/rtl8192e/rtl8192e/Kconfig
@@ -0,0 +1,9 @@
+config RTL8192E
+	tristate "RealTek RTL8192E Wireless LAN NIC driver"
+	depends on PCI && WLAN && RTLLIB
+	depends on m
+	select WIRELESS_EXT
+	select WEXT_PRIV
+	select CRYPTO
+	default N
+	---help---
diff --git a/trunk/drivers/staging/rtl8192e/rtl8192e/Makefile b/trunk/drivers/staging/rtl8192e/rtl8192e/Makefile
@@ -0,0 +1,21 @@
+r8192e_pci-objs :=		\
+	r8192E_dev.o		\
+	r8192E_phy.o		\
+	r8192E_firmware.o	\
+	r8192E_cmdpkt.o		\
+	r8192E_hwimg.o		\
+	r8190P_rtl8256.o	\
+	rtl_cam.o		\
+	rtl_core.o		\
+	rtl_debug.o		\
+	rtl_dm.o		\
+	rtl_eeprom.o		\
+	rtl_ethtool.o		\
+	rtl_pci.o		\
+	rtl_pm.o		\
+	rtl_ps.o		\
+	rtl_wx.o		\
+
+obj-$(CONFIG_RTL8192E) += r8192e_pci.o
+
+ccflags-y += -D__CHECK_ENDIAN__
diff --git a/trunk/drivers/staging/rtl8192e/r8190P_def.h → ...rs/staging/rtl8192e/rtl8192e/r8190P_def.h b/trunk/drivers/staging/rtl8192e/r8190P_def.h → ...rs/staging/rtl8192e/rtl8192e/r8190P_def.h
diff --git a/...drivers/staging/rtl8192e/r8190P_rtl8256.c → ...taging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/...drivers/staging/rtl8192e/r8190P_rtl8256.c → ...taging/rtl8192e/rtl8192e/r8190P_rtl8256.c
diff --git a/...drivers/staging/rtl8192e/r8190P_rtl8256.h → ...taging/rtl8192e/rtl8192e/r8190P_rtl8256.h b/...drivers/staging/rtl8192e/r8190P_rtl8256.h → ...taging/rtl8192e/rtl8192e/r8190P_rtl8256.h
diff --git a/.../drivers/staging/rtl8192e/r8192E_cmdpkt.c → ...staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c b/.../drivers/staging/rtl8192e/r8192E_cmdpkt.c → ...staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
diff --git a/.../drivers/staging/rtl8192e/r8192E_cmdpkt.h → ...staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h b/.../drivers/staging/rtl8192e/r8192E_cmdpkt.h → ...staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_dev.c → ...rs/staging/rtl8192e/rtl8192e/r8192E_dev.c b/trunk/drivers/staging/rtl8192e/r8192E_dev.c → ...rs/staging/rtl8192e/rtl8192e/r8192E_dev.c
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_dev.h → ...rs/staging/rtl8192e/rtl8192e/r8192E_dev.h b/trunk/drivers/staging/rtl8192e/r8192E_dev.h → ...rs/staging/rtl8192e/rtl8192e/r8192E_dev.h
diff --git a/...rivers/staging/rtl8192e/r8192E_firmware.c → ...aging/rtl8192e/rtl8192e/r8192E_firmware.c b/...rivers/staging/rtl8192e/r8192E_firmware.c → ...aging/rtl8192e/rtl8192e/r8192E_firmware.c
diff --git a/...rivers/staging/rtl8192e/r8192E_firmware.h → ...aging/rtl8192e/rtl8192e/r8192E_firmware.h b/...rivers/staging/rtl8192e/r8192E_firmware.h → ...aging/rtl8192e/rtl8192e/r8192E_firmware.h
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_hw.h → ...ers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/trunk/drivers/staging/rtl8192e/r8192E_hw.h → ...ers/staging/rtl8192e/rtl8192e/r8192E_hw.h
diff --git a/...k/drivers/staging/rtl8192e/r8192E_hwimg.c → .../staging/rtl8192e/rtl8192e/r8192E_hwimg.c b/...k/drivers/staging/rtl8192e/r8192E_hwimg.c → .../staging/rtl8192e/rtl8192e/r8192E_hwimg.c
diff --git a/...k/drivers/staging/rtl8192e/r8192E_hwimg.h → .../staging/rtl8192e/rtl8192e/r8192E_hwimg.h b/...k/drivers/staging/rtl8192e/r8192E_hwimg.h → .../staging/rtl8192e/rtl8192e/r8192E_hwimg.h
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_phy.c → ...rs/staging/rtl8192e/rtl8192e/r8192E_phy.c b/trunk/drivers/staging/rtl8192e/r8192E_phy.c → ...rs/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -23,7 +23,6 @@
 #include "r8190P_rtl8256.h"
 #include "r8192E_phy.h"
 #include "rtl_dm.h"
-#include "dot11d.h"
 
 #include "r8192E_hwimg.h"
 

diff --git a/trunk/drivers/staging/rtl8192e/r8192E_phy.h → ...rs/staging/rtl8192e/rtl8192e/r8192E_phy.h b/trunk/drivers/staging/rtl8192e/r8192E_phy.h → ...rs/staging/rtl8192e/rtl8192e/r8192E_phy.h
diff --git a/.../drivers/staging/rtl8192e/r8192E_phyreg.h → ...staging/rtl8192e/rtl8192e/r8192E_phyreg.h b/.../drivers/staging/rtl8192e/r8192E_phyreg.h → ...staging/rtl8192e/rtl8192e/r8192E_phyreg.h
diff --git a/.../drivers/staging/rtl8192e/r819xE_phyreg.h → ...staging/rtl8192e/rtl8192e/r819xE_phyreg.h b/.../drivers/staging/rtl8192e/r819xE_phyreg.h → ...staging/rtl8192e/rtl8192e/r819xE_phyreg.h
diff --git a/trunk/drivers/staging/rtl8192e/rtl_cam.c → ...ivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/trunk/drivers/staging/rtl8192e/rtl_cam.c → ...ivers/staging/rtl8192e/rtl8192e/rtl_cam.c
diff --git a/trunk/drivers/staging/rtl8192e/rtl_cam.h → ...ivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/trunk/drivers/staging/rtl8192e/rtl_cam.h → ...ivers/staging/rtl8192e/rtl8192e/rtl_cam.h
diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.c → ...vers/staging/rtl8192e/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl_core.c → ...vers/staging/rtl8192e/rtl8192e/rtl_core.c
diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.h → ...vers/staging/rtl8192e/rtl8192e/rtl_core.h b/trunk/drivers/staging/rtl8192e/rtl_core.h → ...vers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -50,9 +50,9 @@
 /* Need this defined before including local include files */
 #define DRV_NAME "rtl819xE"
 
-#include "rtllib.h"
+#include "../rtllib.h"
 
-#include "dot11d.h"
+#include "../dot11d.h"
 
 #include "r8192E_firmware.h"
 #include "r8192E_hw.h"

diff --git a/trunk/drivers/staging/rtl8192e/rtl_crypto.h → ...rs/staging/rtl8192e/rtl8192e/rtl_crypto.h b/trunk/drivers/staging/rtl8192e/rtl_crypto.h → ...rs/staging/rtl8192e/rtl8192e/rtl_crypto.h
diff --git a/trunk/drivers/staging/rtl8192e/rtl_debug.c → ...ers/staging/rtl8192e/rtl8192e/rtl_debug.c b/trunk/drivers/staging/rtl8192e/rtl_debug.c → ...ers/staging/rtl8192e/rtl8192e/rtl_debug.c
diff --git a/trunk/drivers/staging/rtl8192e/rtl_dm.c → ...rivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/trunk/drivers/staging/rtl8192e/rtl_dm.c → ...rivers/staging/rtl8192e/rtl8192e/rtl_dm.c
diff --git a/trunk/drivers/staging/rtl8192e/rtl_dm.h → ...rivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/trunk/drivers/staging/rtl8192e/rtl_dm.h → ...rivers/staging/rtl8192e/rtl8192e/rtl_dm.h
diff --git a/trunk/drivers/staging/rtl8192e/rtl_eeprom.c → ...rs/staging/rtl8192e/rtl8192e/rtl_eeprom.c b/trunk/drivers/staging/rtl8192e/rtl_eeprom.c → ...rs/staging/rtl8192e/rtl8192e/rtl_eeprom.c
diff --git a/trunk/drivers/staging/rtl8192e/rtl_eeprom.h → ...rs/staging/rtl8192e/rtl8192e/rtl_eeprom.h b/trunk/drivers/staging/rtl8192e/rtl_eeprom.h → ...rs/staging/rtl8192e/rtl8192e/rtl_eeprom.h
diff --git a/trunk/drivers/staging/rtl8192e/rtl_ethtool.c → ...s/staging/rtl8192e/rtl8192e/rtl_ethtool.c b/trunk/drivers/staging/rtl8192e/rtl_ethtool.c → ...s/staging/rtl8192e/rtl8192e/rtl_ethtool.c
diff --git a/trunk/drivers/staging/rtl8192e/rtl_pci.c → ...ivers/staging/rtl8192e/rtl8192e/rtl_pci.c b/trunk/drivers/staging/rtl8192e/rtl_pci.c → ...ivers/staging/rtl8192e/rtl8192e/rtl_pci.c
diff --git a/trunk/drivers/staging/rtl8192e/rtl_pci.h → ...ivers/staging/rtl8192e/rtl8192e/rtl_pci.h b/trunk/drivers/staging/rtl8192e/rtl_pci.h → ...ivers/staging/rtl8192e/rtl8192e/rtl_pci.h
diff --git a/trunk/drivers/staging/rtl8192e/rtl_pm.c → ...rivers/staging/rtl8192e/rtl8192e/rtl_pm.c b/trunk/drivers/staging/rtl8192e/rtl_pm.c → ...rivers/staging/rtl8192e/rtl8192e/rtl_pm.c
diff --git a/trunk/drivers/staging/rtl8192e/rtl_pm.h → ...rivers/staging/rtl8192e/rtl8192e/rtl_pm.h b/trunk/drivers/staging/rtl8192e/rtl_pm.h → ...rivers/staging/rtl8192e/rtl8192e/rtl_pm.h
diff --git a/trunk/drivers/staging/rtl8192e/rtl_ps.c → ...rivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/trunk/drivers/staging/rtl8192e/rtl_ps.c → ...rivers/staging/rtl8192e/rtl8192e/rtl_ps.c
diff --git a/trunk/drivers/staging/rtl8192e/rtl_ps.h → ...rivers/staging/rtl8192e/rtl8192e/rtl_ps.h b/trunk/drivers/staging/rtl8192e/rtl_ps.h → ...rivers/staging/rtl8192e/rtl8192e/rtl_ps.h
diff --git a/trunk/drivers/staging/rtl8192e/rtl_wx.c → ...rivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/trunk/drivers/staging/rtl8192e/rtl_wx.c → ...rivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -19,7 +19,6 @@
 
 #include <linux/string.h>
 #include "rtl_core.h"
-#include "dot11d.h"
 
 #define RATE_COUNT 12
 static u32 rtl8192_rates[] = {

diff --git a/trunk/drivers/staging/rtl8192e/rtl_wx.h → ...rivers/staging/rtl8192e/rtl8192e/rtl_wx.h b/trunk/drivers/staging/rtl8192e/rtl_wx.h → ...rivers/staging/rtl8192e/rtl8192e/rtl_wx.h