From 3d461c912462b6b36ff9cf2c2f605ef37aeab438 Mon Sep 17 00:00:00 2001 From: Sean MacLennan Date: Mon, 28 Nov 2011 20:22:26 -0500 Subject: [PATCH] rtl8192e: Split into two directories Now that the rtl8192e driver is split up, it makes sense to keep the rtllib code in one directory and the rtl8192e specific code in another. This patch contains the split and the fixup of includes. Since rtl_core.h already included rtllib.h and dot11d.h, rtl_core.h was updated to point to the parent directory. All other references to rtllib.h and dot11d.h in the rtl8192e specific code where deleted rather than fixed. This leaves just one file that needs to know the real location of the rtllib includes. Signed-off-by: Sean MacLennan Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/Kconfig | 14 +++++-------- drivers/staging/rtl8192e/Makefile | 20 +----------------- drivers/staging/rtl8192e/rtl8192e/Kconfig | 9 ++++++++ drivers/staging/rtl8192e/rtl8192e/Makefile | 21 +++++++++++++++++++ .../rtl8192e/{ => rtl8192e}/r8190P_def.h | 0 .../rtl8192e/{ => rtl8192e}/r8190P_rtl8256.c | 0 .../rtl8192e/{ => rtl8192e}/r8190P_rtl8256.h | 0 .../rtl8192e/{ => rtl8192e}/r8192E_cmdpkt.c | 0 .../rtl8192e/{ => rtl8192e}/r8192E_cmdpkt.h | 0 .../rtl8192e/{ => rtl8192e}/r8192E_dev.c | 0 .../rtl8192e/{ => rtl8192e}/r8192E_dev.h | 0 .../rtl8192e/{ => rtl8192e}/r8192E_firmware.c | 0 .../rtl8192e/{ => rtl8192e}/r8192E_firmware.h | 0 .../rtl8192e/{ => rtl8192e}/r8192E_hw.h | 0 .../rtl8192e/{ => rtl8192e}/r8192E_hwimg.c | 0 .../rtl8192e/{ => rtl8192e}/r8192E_hwimg.h | 0 .../rtl8192e/{ => rtl8192e}/r8192E_phy.c | 1 - .../rtl8192e/{ => rtl8192e}/r8192E_phy.h | 0 .../rtl8192e/{ => rtl8192e}/r8192E_phyreg.h | 0 .../rtl8192e/{ => rtl8192e}/r819xE_phyreg.h | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_cam.c | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_cam.h | 0 .../rtl8192e/{ => rtl8192e}/rtl_core.c | 0 .../rtl8192e/{ => rtl8192e}/rtl_core.h | 4 ++-- .../rtl8192e/{ => rtl8192e}/rtl_crypto.h | 0 .../rtl8192e/{ => rtl8192e}/rtl_debug.c | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_dm.c | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_dm.h | 0 .../rtl8192e/{ => rtl8192e}/rtl_eeprom.c | 0 .../rtl8192e/{ => rtl8192e}/rtl_eeprom.h | 0 .../rtl8192e/{ => rtl8192e}/rtl_ethtool.c | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_pci.c | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_pci.h | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_pm.c | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_pm.h | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_ps.c | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_ps.h | 0 .../staging/rtl8192e/{ => rtl8192e}/rtl_wx.c | 1 - .../staging/rtl8192e/{ => rtl8192e}/rtl_wx.h | 0 39 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 drivers/staging/rtl8192e/rtl8192e/Kconfig create mode 100644 drivers/staging/rtl8192e/rtl8192e/Makefile rename drivers/staging/rtl8192e/{ => rtl8192e}/r8190P_def.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8190P_rtl8256.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8190P_rtl8256.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_cmdpkt.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_cmdpkt.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_dev.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_dev.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_firmware.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_firmware.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_hw.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_hwimg.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_hwimg.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_phy.c (99%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_phy.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r8192E_phyreg.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/r819xE_phyreg.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_cam.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_cam.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_core.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_core.h (99%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_crypto.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_debug.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_dm.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_dm.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_eeprom.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_eeprom.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_ethtool.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_pci.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_pci.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_pm.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_pm.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_ps.c (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_ps.h (100%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_wx.c (99%) rename drivers/staging/rtl8192e/{ => rtl8192e}/rtl_wx.h (100%) diff --git a/drivers/staging/rtl8192e/Kconfig b/drivers/staging/rtl8192e/Kconfig index 44425ce9e8e..a24305d7ae3 100644 --- a/drivers/staging/rtl8192e/Kconfig +++ b/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/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile index d16f2ffbf5e..729cb7b9366 100644 --- a/drivers/staging/rtl8192e/Makefile +++ b/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/drivers/staging/rtl8192e/rtl8192e/Kconfig b/drivers/staging/rtl8192e/rtl8192e/Kconfig new file mode 100644 index 00000000000..50e0d91a409 --- /dev/null +++ b/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/drivers/staging/rtl8192e/rtl8192e/Makefile b/drivers/staging/rtl8192e/rtl8192e/Makefile new file mode 100644 index 00000000000..313a92ec683 --- /dev/null +++ b/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/drivers/staging/rtl8192e/r8190P_def.h b/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h similarity index 100% rename from drivers/staging/rtl8192e/r8190P_def.h rename to drivers/staging/rtl8192e/rtl8192e/r8190P_def.h diff --git a/drivers/staging/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c similarity index 100% rename from drivers/staging/rtl8192e/r8190P_rtl8256.c rename to drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c diff --git a/drivers/staging/rtl8192e/r8190P_rtl8256.h b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h similarity index 100% rename from drivers/staging/rtl8192e/r8190P_rtl8256.h rename to drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c similarity index 100% rename from drivers/staging/rtl8192e/r8192E_cmdpkt.c rename to drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h similarity index 100% rename from drivers/staging/rtl8192e/r8192E_cmdpkt.h rename to drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c similarity index 100% rename from drivers/staging/rtl8192e/r8192E_dev.c rename to drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c diff --git a/drivers/staging/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h similarity index 100% rename from drivers/staging/rtl8192e/r8192E_dev.h rename to drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h diff --git a/drivers/staging/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c similarity index 100% rename from drivers/staging/rtl8192e/r8192E_firmware.c rename to drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c diff --git a/drivers/staging/rtl8192e/r8192E_firmware.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h similarity index 100% rename from drivers/staging/rtl8192e/r8192E_firmware.h rename to drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h diff --git a/drivers/staging/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h similarity index 100% rename from drivers/staging/rtl8192e/r8192E_hw.h rename to drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h diff --git a/drivers/staging/rtl8192e/r8192E_hwimg.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c similarity index 100% rename from drivers/staging/rtl8192e/r8192E_hwimg.c rename to drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c diff --git a/drivers/staging/rtl8192e/r8192E_hwimg.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h similarity index 100% rename from drivers/staging/rtl8192e/r8192E_hwimg.h rename to drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h diff --git a/drivers/staging/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c similarity index 99% rename from drivers/staging/rtl8192e/r8192E_phy.c rename to drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 7fe69a3348d..4db46a878b6 100644 --- a/drivers/staging/rtl8192e/r8192E_phy.c +++ b/drivers/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/drivers/staging/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h similarity index 100% rename from drivers/staging/rtl8192e/r8192E_phy.h rename to drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h diff --git a/drivers/staging/rtl8192e/r8192E_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h similarity index 100% rename from drivers/staging/rtl8192e/r8192E_phyreg.h rename to drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h diff --git a/drivers/staging/rtl8192e/r819xE_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h similarity index 100% rename from drivers/staging/rtl8192e/r819xE_phyreg.h rename to drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h diff --git a/drivers/staging/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c similarity index 100% rename from drivers/staging/rtl8192e/rtl_cam.c rename to drivers/staging/rtl8192e/rtl8192e/rtl_cam.c diff --git a/drivers/staging/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h similarity index 100% rename from drivers/staging/rtl8192e/rtl_cam.h rename to drivers/staging/rtl8192e/rtl8192e/rtl_cam.h diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c similarity index 100% rename from drivers/staging/rtl8192e/rtl_core.c rename to drivers/staging/rtl8192e/rtl8192e/rtl_core.c diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h similarity index 99% rename from drivers/staging/rtl8192e/rtl_core.h rename to drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 46407efacc9..93478df42b7 100644 --- a/drivers/staging/rtl8192e/rtl_core.h +++ b/drivers/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/drivers/staging/rtl8192e/rtl_crypto.h b/drivers/staging/rtl8192e/rtl8192e/rtl_crypto.h similarity index 100% rename from drivers/staging/rtl8192e/rtl_crypto.h rename to drivers/staging/rtl8192e/rtl8192e/rtl_crypto.h diff --git a/drivers/staging/rtl8192e/rtl_debug.c b/drivers/staging/rtl8192e/rtl8192e/rtl_debug.c similarity index 100% rename from drivers/staging/rtl8192e/rtl_debug.c rename to drivers/staging/rtl8192e/rtl8192e/rtl_debug.c diff --git a/drivers/staging/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c similarity index 100% rename from drivers/staging/rtl8192e/rtl_dm.c rename to drivers/staging/rtl8192e/rtl8192e/rtl_dm.c diff --git a/drivers/staging/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h similarity index 100% rename from drivers/staging/rtl8192e/rtl_dm.h rename to drivers/staging/rtl8192e/rtl8192e/rtl_dm.h diff --git a/drivers/staging/rtl8192e/rtl_eeprom.c b/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c similarity index 100% rename from drivers/staging/rtl8192e/rtl_eeprom.c rename to drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c diff --git a/drivers/staging/rtl8192e/rtl_eeprom.h b/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h similarity index 100% rename from drivers/staging/rtl8192e/rtl_eeprom.h rename to drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h diff --git a/drivers/staging/rtl8192e/rtl_ethtool.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c similarity index 100% rename from drivers/staging/rtl8192e/rtl_ethtool.c rename to drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c diff --git a/drivers/staging/rtl8192e/rtl_pci.c b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c similarity index 100% rename from drivers/staging/rtl8192e/rtl_pci.c rename to drivers/staging/rtl8192e/rtl8192e/rtl_pci.c diff --git a/drivers/staging/rtl8192e/rtl_pci.h b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h similarity index 100% rename from drivers/staging/rtl8192e/rtl_pci.h rename to drivers/staging/rtl8192e/rtl8192e/rtl_pci.h diff --git a/drivers/staging/rtl8192e/rtl_pm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c similarity index 100% rename from drivers/staging/rtl8192e/rtl_pm.c rename to drivers/staging/rtl8192e/rtl8192e/rtl_pm.c diff --git a/drivers/staging/rtl8192e/rtl_pm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h similarity index 100% rename from drivers/staging/rtl8192e/rtl_pm.h rename to drivers/staging/rtl8192e/rtl8192e/rtl_pm.h diff --git a/drivers/staging/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c similarity index 100% rename from drivers/staging/rtl8192e/rtl_ps.c rename to drivers/staging/rtl8192e/rtl8192e/rtl_ps.c diff --git a/drivers/staging/rtl8192e/rtl_ps.h b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h similarity index 100% rename from drivers/staging/rtl8192e/rtl_ps.h rename to drivers/staging/rtl8192e/rtl8192e/rtl_ps.h diff --git a/drivers/staging/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c similarity index 99% rename from drivers/staging/rtl8192e/rtl_wx.c rename to drivers/staging/rtl8192e/rtl8192e/rtl_wx.c index 93b1edbe6ba..44fffe2f3d0 100644 --- a/drivers/staging/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -19,7 +19,6 @@ #include #include "rtl_core.h" -#include "dot11d.h" #define RATE_COUNT 12 static u32 rtl8192_rates[] = { diff --git a/drivers/staging/rtl8192e/rtl_wx.h b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.h similarity index 100% rename from drivers/staging/rtl8192e/rtl_wx.h rename to drivers/staging/rtl8192e/rtl8192e/rtl_wx.h