From 55de8362677f01e65bc2e65652324c2c562338c6 Mon Sep 17 00:00:00 2001
From: Chaoming Li <chaoming_li@realsil.com.cn>
Date: Tue, 3 May 2011 09:49:36 -0500
Subject: [PATCH] --- yaml --- r: 247538 b: refs/heads/master c:
 85e09b40405b44b049500702beb6856646b4be46 h: refs/heads/master v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/net/wireless/rtlwifi/Kconfig        | 15 +++++++++++++--
 trunk/drivers/net/wireless/rtlwifi/Makefile       |  1 +
 .../net/wireless/rtlwifi/rtl8192se/Makefile       | 15 +++++++++++++++
 trunk/drivers/net/wireless/rtlwifi/rtl8192se/sw.c |  2 +-
 5 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 trunk/drivers/net/wireless/rtlwifi/rtl8192se/Makefile

diff --git a/[refs] b/[refs]
index 8dc3992abd43..31a07acf55a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84f494cef7d98d67aa7d50ede12784464aa0c274
+refs/heads/master: 85e09b40405b44b049500702beb6856646b4be46
diff --git a/trunk/drivers/net/wireless/rtlwifi/Kconfig b/trunk/drivers/net/wireless/rtlwifi/Kconfig
index ce49e0ce7cad..5aee8b22d74e 100644
--- a/trunk/drivers/net/wireless/rtlwifi/Kconfig
+++ b/trunk/drivers/net/wireless/rtlwifi/Kconfig
@@ -10,6 +10,17 @@ config RTL8192CE
 
 	If you choose to build it as a module, it will be called rtl8192ce
 
+config RTL8192SE
+	tristate "Realtek RTL8192SE/RTL8191SE PCIe Wireless Network Adapter"
+	depends on MAC80211 && EXPERIMENTAL
+	select FW_LOADER
+	select RTLWIFI
+	---help---
+	This is the driver for Realtek RTL8192SE/RTL8191SE 802.11n PCIe
+	wireless network adapters.
+
+	If you choose to build it as a module, it will be called rtl8192se
+
 config RTL8192CU
 	tristate "Realtek RTL8192CU/RTL8188CU USB Wireless Network Adapter"
 	depends on MAC80211 && USB && EXPERIMENTAL
@@ -24,10 +35,10 @@ config RTL8192CU
 
 config RTLWIFI
 	tristate
-	depends on RTL8192CE || RTL8192CU
+	depends on RTL8192CE || RTL8192CU || RTL8192SE
 	default m
 
 config RTL8192C_COMMON
 	tristate
-	depends on RTL8192CE || RTL8192CU
+	depends on RTL8192CE || RTL8192CU || RTL8192SE
 	default m
diff --git a/trunk/drivers/net/wireless/rtlwifi/Makefile b/trunk/drivers/net/wireless/rtlwifi/Makefile
index ec9393f24799..7acce83c3785 100644
--- a/trunk/drivers/net/wireless/rtlwifi/Makefile
+++ b/trunk/drivers/net/wireless/rtlwifi/Makefile
@@ -22,5 +22,6 @@ endif
 obj-$(CONFIG_RTL8192C_COMMON)	+= rtl8192c/
 obj-$(CONFIG_RTL8192CE)		+= rtl8192ce/
 obj-$(CONFIG_RTL8192CU)		+= rtl8192cu/
+obj-$(CONFIG_RTL8192SE)		+= rtl8192se/
 
 ccflags-y += -D__CHECK_ENDIAN__
diff --git a/trunk/drivers/net/wireless/rtlwifi/rtl8192se/Makefile b/trunk/drivers/net/wireless/rtlwifi/rtl8192se/Makefile
new file mode 100644
index 000000000000..b7eb13819cbc
--- /dev/null
+++ b/trunk/drivers/net/wireless/rtlwifi/rtl8192se/Makefile
@@ -0,0 +1,15 @@
+rtl8192se-objs :=		\
+		dm.o		\
+		fw.o		\
+		hw.o		\
+		led.o		\
+		phy.o		\
+		rf.o		\
+		sw.o		\
+		table.o		\
+		trx.o
+
+obj-$(CONFIG_RTL8192SE) += rtl8192se.o
+
+ccflags-y += -D__CHECK_ENDIAN__
+
diff --git a/trunk/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/trunk/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index c5351b65b339..7cfd6a2cb140 100644
--- a/trunk/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/trunk/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -58,7 +58,7 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw)
 	 * 4 - Always Enable ASPM without Clock Req.
 	 * set defult to RTL8192CE:3 RTL8192E:2
 	 * */
-	rtlpci->const_pci_aspm = 2;
+	rtlpci->const_pci_aspm = 0; /* changed from 2 due to crashes */
 
 	/*Setting for PCI-E device */
 	rtlpci->const_devicepci_aspm_setting = 0x03;