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

Commit 6f334c2b authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: Fix build errors for unusual cases 



The present build configuration for the rtlwifi family of drivers will
fail under two known conditions:

(1) If rtlwifi is selected without selecting any of the dependent drivers,
    there are errors in the build.
(2) If the PCI drivers are built into the kernel and the USB drivers are modules,
    or vice versa, there are missing globals.

The first condition is fixed by never building rtlwifi unless at least one
of the device drivers is selected. The second failure is fixed by splitting
the PCI and USB codes out of rtlwifi, and creating their own mini drivers.
If the drivers that use them are modules, they will also be modules.

Although a number of files are touched by this patch, only Makefile and Kconfig
have undergone significant changes. The only modifications to the other files
were to export entry points needed by the new rtl_pci and rtl_usb units, or to
rename two variables that had names that were likely to cause namespace collisions.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>  [Condition 1]
Reported-by: Ben Hutchings <bhutchings@solarflare.com> [Condition 2]
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Ben Hutchings <bhutchings@solarflare.com>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f287cbd0

drivers/net/wireless/rtlwifi/Kconfig

+48 −24
Original line number Diff line number Diff line 
config RTLWIFI

	tristate "Realtek wireless card support"

	depends on MAC80211

	select FW_LOADER

	---help---

	  This is common code for RTL8192CE/RTL8192CU/RTL8192SE/RTL8723AE

	  drivers.  This module does nothing by itself - the various front-end

	  drivers need to be enabled to support any desired devices.



	  If you choose to build as a module, it'll be called rtlwifi.



config RTLWIFI_DEBUG

	bool "Debugging output for rtlwifi driver family"

	depends on RTLWIFI

menuconfig RTL_CARDS

	tristate "Realtek rtlwifi family of devices"

	depends on MAC80211 && (PCI || USB)

	default y

	---help---

	To use the module option that sets the dynamic-debugging level for,

	the front-end driver, this parameter must be "Y". For memory-limited

	systems, choose "N". If in doubt, choose "Y".

	  This option will enable support for the Realtek mac80211-based

	  wireless drivers. Drivers rtl8192ce, rtl8192cu, rtl8192se, rtl8192de,

	  rtl8723eu, and rtl8188eu share some common code.



if RTL_CARDS



config RTL8192CE

	tristate "Realtek RTL8192CE/RTL8188CE Wireless Network Adapter"

	depends on RTLWIFI && PCI

	depends on PCI

	select RTL8192C_COMMON

	select RTLWIFI

	select RTLWIFI_PCI

	---help---

	This is the driver for Realtek RTL8192CE/RTL8188CE 802.11n PCIe

	wireless network adapters.
@@ -30,7 +23,9 @@ config RTL8192CE 


config RTL8192SE

	tristate "Realtek RTL8192SE/RTL8191SE PCIe Wireless Network Adapter"

	depends on RTLWIFI && PCI

	depends on PCI

	select RTLWIFI

	select RTLWIFI_PCI

	---help---

	This is the driver for Realtek RTL8192SE/RTL8191SE 802.11n PCIe

	wireless network adapters.
@@ -39,7 +34,9 @@ config RTL8192SE 


config RTL8192DE

	tristate "Realtek RTL8192DE/RTL8188DE PCIe Wireless Network Adapter"

	depends on RTLWIFI && PCI

	depends on PCI

	select RTLWIFI

	select RTLWIFI_PCI

	---help---

	This is the driver for Realtek RTL8192DE/RTL8188DE 802.11n PCIe

	wireless network adapters.
@@ -48,7 +45,9 @@ config RTL8192DE 


config RTL8723AE

	tristate "Realtek RTL8723AE PCIe Wireless Network Adapter"

	depends on RTLWIFI && PCI

	depends on PCI

	select RTLWIFI

	select RTLWIFI_PCI

	---help---

	This is the driver for Realtek RTL8723AE 802.11n PCIe

	wireless network adapters.
@@ -57,7 +56,9 @@ config RTL8723AE 


config RTL8188EE

	tristate "Realtek RTL8188EE Wireless Network Adapter"

	depends on RTLWIFI && PCI

	depends on PCI

	select RTLWIFI

	select RTLWIFI_PCI

	---help---

	This is the driver for Realtek RTL8188EE 802.11n PCIe

	wireless network adapters.
@@ -66,7 +67,9 @@ config RTL8188EE 


config RTL8192CU

	tristate "Realtek RTL8192CU/RTL8188CU USB Wireless Network Adapter"

	depends on RTLWIFI && USB

	depends on USB

	select RTLWIFI

	select RTLWIFI_USB

	select RTL8192C_COMMON

	---help---

	This is the driver for Realtek RTL8192CU/RTL8188CU 802.11n USB
@@ -74,7 +77,28 @@ config RTL8192CU 


	If you choose to build it as a module, it will be called rtl8192cu



config RTLWIFI

	tristate

	select FW_LOADER



config RTLWIFI_PCI

	tristate



config RTLWIFI_USB

	tristate



config RTLWIFI_DEBUG

	bool "Debugging output for rtlwifi driver family"

	depends on RTLWIFI

	default y

	---help---

	To use the module option that sets the dynamic-debugging level for,

	the front-end driver, this parameter must be "Y". For memory-limited

	systems, choose "N". If in doubt, choose "Y".



config RTL8192C_COMMON

	tristate

	depends on RTL8192CE || RTL8192CU

	default m
 
	default y



endif

drivers/net/wireless/rtlwifi/Makefile

+4 −6
Original line number Diff line number Diff line
@@ -12,13 +12,11 @@ rtlwifi-objs := \ 


rtl8192c_common-objs +=		\



ifneq ($(CONFIG_PCI),)

rtlwifi-objs	+= pci.o

endif

obj-$(CONFIG_RTLWIFI_PCI)	+= rtl_pci.o

rtl_pci-objs	:=		pci.o



ifneq ($(CONFIG_USB),)

rtlwifi-objs	+= usb.o

endif

obj-$(CONFIG_RTLWIFI_USB)	+= rtl_usb.o

rtl_usb-objs	:=		usb.o



obj-$(CONFIG_RTL8192C_COMMON)	+= rtl8192c/

obj-$(CONFIG_RTL8192CE)		+= rtl8192ce/

drivers/net/wireless/rtlwifi/base.c

+16 −3
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ u8 rtl_tid_to_ac(u8 tid) 
{

	return tid_to_ac[tid];

}

EXPORT_SYMBOL_GPL(rtl_tid_to_ac);



static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw,

				  struct ieee80211_sta_ht_cap *ht_cap)
@@ -406,6 +407,7 @@ void rtl_deinit_deferred_work(struct ieee80211_hw *hw) 
	cancel_delayed_work(&rtlpriv->works.ps_rfon_wq);

	cancel_delayed_work(&rtlpriv->works.fwevt_wq);

}

EXPORT_SYMBOL_GPL(rtl_deinit_deferred_work);



void rtl_init_rfkill(struct ieee80211_hw *hw)

{
@@ -439,6 +441,7 @@ void rtl_deinit_rfkill(struct ieee80211_hw *hw) 
{

	wiphy_rfkill_stop_polling(hw->wiphy);

}

EXPORT_SYMBOL_GPL(rtl_deinit_rfkill);



int rtl_init_core(struct ieee80211_hw *hw)

{
@@ -489,10 +492,12 @@ int rtl_init_core(struct ieee80211_hw *hw) 


	return 0;

}

EXPORT_SYMBOL_GPL(rtl_init_core);



void rtl_deinit_core(struct ieee80211_hw *hw)

{

}

EXPORT_SYMBOL_GPL(rtl_deinit_core);



void rtl_init_rx_config(struct ieee80211_hw *hw)

{
@@ -501,6 +506,7 @@ void rtl_init_rx_config(struct ieee80211_hw *hw) 


	rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *) (&mac->rx_conf));

}

EXPORT_SYMBOL_GPL(rtl_init_rx_config);



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

 *
@@ -879,6 +885,7 @@ bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb) 


	return true;

}

EXPORT_SYMBOL_GPL(rtl_tx_mgmt_proc);



void rtl_get_tcb_desc(struct ieee80211_hw *hw,

		      struct ieee80211_tx_info *info,
@@ -1052,6 +1059,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 


	return true;

}

EXPORT_SYMBOL_GPL(rtl_action_proc);



/*should call before software enc*/

u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
@@ -1125,6 +1133,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 


	return false;

}

EXPORT_SYMBOL_GPL(rtl_is_special_data);



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

 *
@@ -1300,6 +1309,7 @@ void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb) 


	rtlpriv->link_info.bcn_rx_inperiod++;

}

EXPORT_SYMBOL_GPL(rtl_beacon_statistic);



void rtl_watchdog_wq_callback(void *data)

{
@@ -1793,6 +1803,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) 


	mac->vendor = vendor;

}

EXPORT_SYMBOL_GPL(rtl_recognize_peer);



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

 *
@@ -1849,6 +1860,7 @@ struct attribute_group rtl_attribute_group = { 
	.name = "rtlsysfs",

	.attrs = rtl_sysfs_entries,

};

EXPORT_SYMBOL_GPL(rtl_attribute_group);



MODULE_AUTHOR("lizhaoming	<chaoming_li@realsil.com.cn>");

MODULE_AUTHOR("Realtek WlanFAE	<wlanfae@realtek.com>");
@@ -1856,7 +1868,8 @@ MODULE_AUTHOR("Larry Finger <Larry.FInger@lwfinger.net>"); 
MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Realtek 802.11n PCI wireless core");



struct rtl_global_var global_var = {};

struct rtl_global_var rtl_global_var = {};

EXPORT_SYMBOL_GPL(rtl_global_var);



static int __init rtl_core_module_init(void)

{
@@ -1864,8 +1877,8 @@ static int __init rtl_core_module_init(void) 
		pr_err("Unable to register rtl_rc, use default RC !!\n");



	/* init some global vars */

	INIT_LIST_HEAD(&global_var.glb_priv_list);

	spin_lock_init(&global_var.glb_list_lock);

	INIT_LIST_HEAD(&rtl_global_var.glb_priv_list);

	spin_lock_init(&rtl_global_var.glb_list_lock);



	return 0;

}

drivers/net/wireless/rtlwifi/base.h

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len); 
u8 rtl_tid_to_ac(u8 tid);

extern struct attribute_group rtl_attribute_group;

void rtl_easy_concurrent_retrytimer_callback(unsigned long data);

extern struct rtl_global_var global_var;

extern struct rtl_global_var rtl_global_var;

int rtlwifi_rate_mapping(struct ieee80211_hw *hw,

			 bool isht, u8 desc_rate, bool first_ampdu);

bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);

drivers/net/wireless/rtlwifi/core.c

+1 −0
Original line number Diff line number Diff line
@@ -1330,3 +1330,4 @@ const struct ieee80211_ops rtl_ops = { 
	.rfkill_poll = rtl_op_rfkill_poll,

	.flush = rtl_op_flush,

};

EXPORT_SYMBOL_GPL(rtl_ops);