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

Commit f61fb935 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192u: make it compile 



Add it to staging Kbuild and fixes some API differences that prevents
compilation.

It seems that the ieee80211 stack is very close to rtl8192su one.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8fc8598e

drivers/staging/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ source "drivers/staging/rtl8187se/Kconfig" 


source "drivers/staging/rtl8192su/Kconfig"



source "drivers/staging/rtl8192u/Kconfig"



source "drivers/staging/rtl8192e/Kconfig"



source "drivers/staging/mimio/Kconfig"

drivers/staging/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ obj-$(CONFIG_PANEL) += panel/ 
obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma/

obj-$(CONFIG_R8187SE)		+= rtl8187se/

obj-$(CONFIG_RTL8192SU)		+= rtl8192su/

obj-$(CONFIG_RTL8192U)		+= rtl8192u/

obj-$(CONFIG_RTL8192E)		+= rtl8192e/

obj-$(CONFIG_INPUT_MIMIO)	+= mimio/

obj-$(CONFIG_TRANZPORT)		+= frontier/

drivers/staging/rtl8192u/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO 
#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT

EXTRA_CFLAGS += -DUSE_ONE_PIPE

EXTRA_CFLAGS += -DENABLE_DOT11D

EXTRA_CFLAGS += -Idrivers/staging/rtl8192u/ieee80211



r8192u_usb-objs := r8192U_core.o r8180_93cx6.o r8192U_wx.o		\

		  r8190_rtl8256.o r819xU_phy.o r819xU_firmware.o	\

drivers/staging/rtl8192u/ieee80211.h

+3 −3
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
#include <linux/delay.h>

#include <linux/wireless.h>



#include "../../ieee80211/rtl819x_HT.h"

#include "../../ieee80211/rtl819x_BA.h"

#include "../../ieee80211/rtl819x_TS.h"

#include "ieee80211/rtl819x_HT.h"

#include "ieee80211/rtl819x_BA.h"

#include "ieee80211/rtl819x_TS.h"



#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))

#ifndef bool

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c

+3 −32
Original line number Diff line number Diff line
@@ -53,14 +53,8 @@ void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, 


		list_del(ptr);



		if (entry->ops) {

		if (entry->ops)

			entry->ops->deinit(entry->priv);

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)

			module_put(entry->ops->owner);

#else

			__MOD_DEC_USE_COUNT(entry->ops->owner);

#endif

		}

		kfree(entry);

	}

}
@@ -208,8 +202,7 @@ static struct ieee80211_crypto_ops ieee80211_crypt_null = { 
	.owner			= THIS_MODULE,

};





static int __init ieee80211_crypto_init(void)

int __init ieee80211_crypto_init(void)

{

	int ret = -ENOMEM;
@@ -230,8 +223,7 @@ static int __init ieee80211_crypto_init(void) 
	return ret;

}





static void __exit ieee80211_crypto_deinit(void)

void __exit ieee80211_crypto_deinit(void)

{

	struct list_head *ptr, *n;
@@ -250,24 +242,3 @@ static void __exit ieee80211_crypto_deinit(void) 


	kfree(hcrypt);

}
 


#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))

EXPORT_SYMBOL(ieee80211_crypt_deinit_entries);

EXPORT_SYMBOL(ieee80211_crypt_deinit_handler);

EXPORT_SYMBOL(ieee80211_crypt_delayed_deinit);



EXPORT_SYMBOL(ieee80211_register_crypto_ops);

EXPORT_SYMBOL(ieee80211_unregister_crypto_ops);

EXPORT_SYMBOL(ieee80211_get_crypto_ops);

#else

EXPORT_SYMBOL_NOVERS(ieee80211_crypt_deinit_entries);

EXPORT_SYMBOL_NOVERS(ieee80211_crypt_deinit_handler);

EXPORT_SYMBOL_NOVERS(ieee80211_crypt_delayed_deinit);



EXPORT_SYMBOL_NOVERS(ieee80211_register_crypto_ops);

EXPORT_SYMBOL_NOVERS(ieee80211_unregister_crypto_ops);

EXPORT_SYMBOL_NOVERS(ieee80211_get_crypto_ops);

#endif



module_init(ieee80211_crypto_init);

module_exit(ieee80211_crypto_deinit);