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

Commit d37e0208 authored by Sean MacLennan's avatar Sean MacLennan Committed by Greg Kroah-Hartman
Browse files

rtl8192e: Split the driver up 



This patch splits the current r8192e_pci driver up into six different
drivers: rtllib, rtllib_crypt, rtllib_crypt_ccmp, rtllib_crypt_tkip,
rtllib_crypt_wep, and r8192e_pci.

Now that they are proper modules, the init and exit functions do not
need to be called directly. Also, the rtllib_*_null functions are not
needed since they will be loaded on demand.

Signed-off-by: default avatarSean MacLennan <seanm@seanm.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3b28499c

drivers/staging/rtl8192e/Kconfig

+47 −1
Original line number Diff line number Diff line 
config RTLLIB

	tristate "Support for rtllib wireless devices"

	depends on WLAN && m

	default n

	---help---

	  If you have a wireless card that uses rtllib, say

	  Y. Currently the only card is the rtl8192e.



	  If unsure, say N.



config RTLLIB_CRYPTO

	tristate "Support for rtllib crypto support"

	depends on RTLLIB

	default y

	---help---

	  CCMP crypto driver for rtllib.



	  If you enabled RTLLIB, you want this.



config RTLLIB_CRYPTO_CCMP

	tristate "Support for rtllib CCMP crypto"

	depends on RTLLIB && RTLLIB_CRYPTO

	default y

	---help---

	  CCMP crypto driver for rtllib.



	  If you enabled RTLLIB, you want this.



config RTLLIB_CRYPTO_TKIP

	tristate "Support for rtllib TKIP crypto"

	depends on RTLLIB && RTLLIB_CRYPTO

	default y

	---help---

	  TKIP crypto driver for rtllib.



	  If you enabled RTLLIB, you want this.



config RTLLIB_CRYPTO_WEP

	tristate "Support for rtllib WEP crypto"

	depends on RTLLIB && RTLLIB_CRYPTO

	default y

	---help---

	  TKIP crypto driver for rtllib.



	  If you enabled RTLLIB, you want this.



config RTL8192E

	tristate "RealTek RTL8192E Wireless LAN NIC driver"

	depends on PCI && WLAN

	depends on PCI && WLAN && RTLLIB

	depends on m

	select WIRELESS_EXT

	select WEXT_PRIV

drivers/staging/rtl8192e/Makefile

+29 −24
Original line number Diff line number Diff line 
rtllib-objs :=			\

	dot11d.o		\

	rtllib_module.o		\

	rtllib_rx.o		\

	rtllib_tx.o		\

	rtllib_wx.o		\

	rtllib_softmac.o	\

	rtllib_softmac_wx.o	\

	rtl819x_BAProc.o	\

	rtl819x_HTProc.o	\

	rtl819x_TSProc.o



obj-$(CONFIG_RTLLIB) += rtllib.o



obj-$(CONFIG_RTLLIB_CRYPTO) += rtllib_crypt.o

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 :=		\

	rtl_core.o		\

	rtl_eeprom.o		\

	rtl_ps.o		\

	rtl_wx.o		\

	rtl_cam.o		\

	rtl_dm.o		\

	rtl_pm.o		\

	rtl_pci.o		\

	rtl_debug.o		\

	rtl_ethtool.o		\

	r8192E_dev.o		\

	r8192E_phy.o		\

	r8192E_firmware.o	\

	r8192E_cmdpkt.o		\

	r8192E_hwimg.o		\

	r8190P_rtl8256.o	\

	rtllib_rx.o		\

	rtllib_softmac.o	\

	rtllib_tx.o		\

	rtllib_wx.o		\

	rtllib_module.o		\

	rtllib_softmac_wx.o	\

	rtl819x_HTProc.o	\

	rtl819x_TSProc.o	\

	rtl819x_BAProc.o	\

	dot11d.o		\

	rtllib_crypt.o		\

	rtllib_crypt_tkip.o	\

	rtllib_crypt_ccmp.o	\

	rtllib_crypt_wep.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

drivers/staging/rtl8192e/rtl_core.c

+0 −32
Original line number Diff line number Diff line
@@ -3084,33 +3084,6 @@ bool NicIFDisableNIC(struct net_device *dev) 


static int __init rtl8192_pci_module_init(void)

{

	int ret;



	ret = rtllib_init();

	if (ret) {

		printk(KERN_ERR "rtllib_init() failed %d\n", ret);

		return ret;

	}

	ret = rtllib_crypto_init();

	if (ret) {

		printk(KERN_ERR "rtllib_crypto_init() failed %d\n", ret);

		return ret;

	}

	ret = rtllib_crypto_tkip_init();

	if (ret) {

		printk(KERN_ERR "rtllib_crypto_tkip_init() failed %d\n", ret);

		return ret;

	}

	ret = rtllib_crypto_ccmp_init();

	if (ret) {

		printk(KERN_ERR "rtllib_crypto_ccmp_init() failed %d\n", ret);

		return ret;

	}

	ret = rtllib_crypto_wep_init();

	if (ret) {

		printk(KERN_ERR "rtllib_crypto_wep_init() failed %d\n", ret);

		return ret;

	}

	printk(KERN_INFO "\nLinux kernel driver for RTL8192E WLAN cards\n");

	printk(KERN_INFO "Copyright (c) 2007-2008, Realsil Wlan Driver\n");
@@ -3129,11 +3102,6 @@ static void __exit rtl8192_pci_module_exit(void) 


	RT_TRACE(COMP_DOWN, "Exiting");

	rtl8192_proc_module_remove();

	rtllib_crypto_tkip_exit();

	rtllib_crypto_ccmp_exit();

	rtllib_crypto_wep_exit();

	rtllib_crypto_deinit();

	rtllib_exit();

}



void check_rfctrl_gpio_timer(unsigned long data)

drivers/staging/rtl8192e/rtl_debug.c

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ 
#include "r8190P_rtl8256.h" /* RTL8225 Radio frontend */

#include "r8192E_cmdpkt.h"



u32 rt_global_debug_component = \

				COMP_ERR ;

EXPORT_SYMBOL(rt_global_debug_component);



/****************************************************************************

   -----------------------------PROCFS STUFF-------------------------

*****************************************************************************/

drivers/staging/rtl8192e/rtllib_crypt.c

+5 −0
Original line number Diff line number Diff line
@@ -243,3 +243,8 @@ void __exit rtllib_crypto_deinit(void) 


	kfree(hcrypt);

}



module_init(rtllib_crypto_init);

module_exit(rtllib_crypto_deinit);



MODULE_LICENSE("GPL");