after support different wifi bt chip auto compatible commit for android 5.0, compatib...

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189es/os_dep/linux/sdio_intf.c b/drivers/net/wireless/rockchip_wlan/rtl8189es/os_dep/linux/sdio_intf.c
index 381e5616b5bc8670f0cb8054e758299c1e27acef..e77364aedcc6be8d3fa8e350e7b9e26427397595 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8189es/os_dep/linux/sdio_intf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8189es/os_dep/linux/sdio_intf.c
@@ -1082,8 +1082,13 @@ void rockchip_wifi_exit_module_rtkwifi(void)
     rockchip_wifi_power(0);
 }
 
+#ifdef CONFIG_RTL8189ES
+EXPORT_SYMBOL(rockchip_wifi_init_module_rtkwifi);
+EXPORT_SYMBOL(rockchip_wifi_exit_module_rtkwifi);
+#else
 module_init(rockchip_wifi_init_module_rtkwifi);
 module_exit(rockchip_wifi_exit_module_rtkwifi);
+#endif
 //module_init(rtw_drv_entry);
 //module_exit(rtw_drv_halt);
 

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8192du/os_dep/linux/usb_intf.c b/drivers/net/wireless/rockchip_wlan/rtl8192du/os_dep/linux/usb_intf.c
index b38fb8d31521d8445cb1af4be5aa54a6be9a9221..1771f3609d4c29e269d3efb364183c85bf1c53ee 100644 (file)
--- a/drivers/net/wireless/rockchip_wlan/rtl8192du/os_dep/linux/usb_intf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8192du/os_dep/linux/usb_intf.c
@@ -1670,8 +1670,13 @@ void rockchip_wifi_exit_module_rtkwifi(void)
     rockchip_wifi_power(0);
 }
 
+#ifdef CONFIG_RTL8192DU
+EXPORT_SYMBOL(rockchip_wifi_init_module_rtkwifi);
+EXPORT_SYMBOL(rockchip_wifi_exit_module_rtkwifi);
+#else
 module_init(rockchip_wifi_init_module_rtkwifi);
 module_exit(rockchip_wifi_exit_module_rtkwifi);
+#endif
 //module_init(rtw_drv_entry);
 //module_exit(rtw_drv_halt);
 

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723au/os_dep/linux/usb_intf.c b/drivers/net/wireless/rockchip_wlan/rtl8723au/os_dep/linux/usb_intf.c
index fd2f2bae67bf7cac551e07e68f78c6f8e285adf2..5ab4d0b81a7ea7334abbc518e33a25e56dfcae8d 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723au/os_dep/linux/usb_intf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723au/os_dep/linux/usb_intf.c
@@ -2182,8 +2182,13 @@ void rockchip_wifi_exit_module_rtkwifi(void)
     rockchip_wifi_power(0);
 }
 
+#ifdef CONFIG_RTL8723AU
+EXPORT_SYMBOL(rockchip_wifi_init_module_rtkwifi);
+EXPORT_SYMBOL(rockchip_wifi_exit_module_rtkwifi);
+#else
 module_init(rockchip_wifi_init_module_rtkwifi);
 module_exit(rockchip_wifi_exit_module_rtkwifi);
+#endif
 //module_init(rtw_drv_entry);
 //module_exit(rtw_drv_halt);
 

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs-vq0/os_dep/linux/sdio_intf.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs-vq0/os_dep/linux/sdio_intf.c
index 5192bd64c2a2f32d9d2658bf1fe911c8d6ee853b..d3a7927d84f917ff6ed1473db7a35b99f3e88ebd 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs-vq0/os_dep/linux/sdio_intf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs-vq0/os_dep/linux/sdio_intf.c
@@ -1070,8 +1070,13 @@ void rockchip_wifi_exit_module_rtkwifi(void)
     rockchip_wifi_power(0);
 }
 
+#ifdef CONFIG_RTL8723BS_VQ0
+EXPORT_SYMBOL(rockchip_wifi_init_module_rtkwifi);
+EXPORT_SYMBOL(rockchip_wifi_exit_module_rtkwifi);
+#else
 module_init(rockchip_wifi_init_module_rtkwifi);
 module_exit(rockchip_wifi_exit_module_rtkwifi);
+#endif
 //module_init(rtw_drv_entry);
 //module_exit(rtw_drv_halt);
 

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c
index 1ba24d0c14258bfcc11abe7d572a184acb3c34ad..2e7decce45ebcdd169a4185452aecb74d47b2f1d 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c
@@ -1073,8 +1073,13 @@ void rockchip_wifi_exit_module_rtkwifi(void)
     rockchip_wifi_power(0);
 }
 
+#ifdef CONFIG_RTL8723BS
+EXPORT_SYMBOL(rockchip_wifi_init_module_rtkwifi);
+EXPORT_SYMBOL(rockchip_wifi_exit_module_rtkwifi);
+#else
 module_init(rockchip_wifi_init_module_rtkwifi);
 module_exit(rockchip_wifi_exit_module_rtkwifi);
+#endif
 //module_init(rtw_drv_entry);
 //module_exit(rtw_drv_halt);
 

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bu/os_dep/linux/usb_intf.c b/drivers/net/wireless/rockchip_wlan/rtl8723bu/os_dep/linux/usb_intf.c
index 790f9799c36552c1bc05f9c1bd4a5127aff00252..8d26548a0b24b7a160504f98bbb01769fad82b6e 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bu/os_dep/linux/usb_intf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bu/os_dep/linux/usb_intf.c
@@ -1782,9 +1782,13 @@ void rockchip_wifi_exit_module_rtkwifi(void)
     rockchip_wifi_power(0);
 }
 
+#ifdef CONFIG_RTL8723BU
+EXPORT_SYMBOL(rockchip_wifi_init_module_rtkwifi);
+EXPORT_SYMBOL(rockchip_wifi_exit_module_rtkwifi);
+#else
 module_init(rockchip_wifi_init_module_rtkwifi);
 module_exit(rockchip_wifi_exit_module_rtkwifi);
-
+#endif
 //module_init(rtw_drv_entry);
 //module_exit(rtw_drv_halt);
 

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8812au/os_dep/linux/usb_intf.c b/drivers/net/wireless/rockchip_wlan/rtl8812au/os_dep/linux/usb_intf.c
index b98005011e9009ae708b58b884f01af45797d7cf..915238461f258867bbf1b049b48fd6ea5490e1df 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8812au/os_dep/linux/usb_intf.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8812au/os_dep/linux/usb_intf.c
@@ -1777,8 +1777,13 @@ void rockchip_wifi_exit_module_rtkwifi(void)
     rockchip_wifi_power(0);
 }
 
+#ifdef CONFIG_RTL8812AU
+EXPORT_SYMBOL(rockchip_wifi_init_module_rtkwifi);
+EXPORT_SYMBOL(rockchip_wifi_exit_module_rtkwifi);
+#else
 module_init(rockchip_wifi_init_module_rtkwifi);
 module_exit(rockchip_wifi_exit_module_rtkwifi);
+#endif
 //module_init(rtw_drv_entry);
 //module_exit(rtw_drv_halt);