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

Commit 4bc85c13 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

Revert "iwlwifi: split the drivers for agn and legacy devices 3945/4965" 

This reverts commit aa833c4b.
parent aa833c4b

drivers/net/wireless/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -274,7 +274,6 @@ source "drivers/net/wireless/b43legacy/Kconfig" 
source "drivers/net/wireless/hostap/Kconfig"

source "drivers/net/wireless/ipw2x00/Kconfig"

source "drivers/net/wireless/iwlwifi/Kconfig"

source "drivers/net/wireless/iwlegacy/Kconfig"

source "drivers/net/wireless/iwmc3200wifi/Kconfig"

source "drivers/net/wireless/libertas/Kconfig"

source "drivers/net/wireless/orinoco/Kconfig"

drivers/net/wireless/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ obj-$(CONFIG_ADM8211) += adm8211.o 


obj-$(CONFIG_MWL8K)	+= mwl8k.o



obj-$(CONFIG_IWLAGN)	+= iwlwifi/

obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwlegacy/

obj-$(CONFIG_IWLWIFI)	+= iwlwifi/

obj-$(CONFIG_RT2X00)	+= rt2x00/



obj-$(CONFIG_P54_COMMON)	+= p54/

drivers/net/wireless/iwlwifi/Kconfig

+81 −43
Original line number Diff line number Diff line 
config IWLAGN

	tristate "Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlagn) "

config IWLWIFI

	tristate "Intel Wireless Wifi"

	depends on PCI && MAC80211

	select FW_LOADER

	select NEW_LEDS

	select LEDS_CLASS

	select LEDS_TRIGGERS

	select MAC80211_LEDS

	---help---

	  Select to build the driver supporting the:



	  Intel Wireless WiFi Link Next-Gen AGN



	  This option enables support for use with the following hardware:

		Intel Wireless WiFi Link 6250AGN Adapter

		Intel 6000 Series Wi-Fi Adapters (6200AGN and 6300AGN)

		Intel WiFi Link 1000BGN

		Intel Wireless WiFi 5150AGN

		Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN

		Intel 6005 Series Wi-Fi Adapters

		Intel 6030 Series Wi-Fi Adapters

		Intel Wireless WiFi Link 6150BGN 2 Adapter

		Intel 100 Series Wi-Fi Adapters (100BGN and 130BGN)

		Intel 2000 Series Wi-Fi Adapters





	  This driver uses the kernel's mac80211 subsystem.



	  In order to use this driver, you will need a microcode (uCode)

	  image for it. You can obtain the microcode from:



	          <http://intellinuxwireless.org/>.



	  The microcode is typically installed in /lib/firmware. You can

	  look in the hotplug script /etc/hotplug/firmware.agent to

	  determine which directory FIRMWARE_DIR is set to when the script

	  runs.



	  If you want to compile the driver as a module ( = code which can be

	  inserted in and removed from the running kernel whenever you want),

	  say M here and read <file:Documentation/kbuild/modules.txt>.  The

	  module will be called iwlagn.



menu "Debugging Options"

	depends on IWLAGN

	depends on IWLWIFI



config IWLWIFI_DEBUG

	bool "Enable full debugging output in the iwlagn driver"

	depends on IWLAGN

	bool "Enable full debugging output in iwlagn and iwl3945 drivers"

	depends on IWLWIFI

	---help---

	  This option will enable debug tracing output for the iwlwifi drivers
@@ -71,7 +37,7 @@ config IWLWIFI_DEBUG 


config IWLWIFI_DEBUGFS

        bool "iwlagn debugfs support"

        depends on IWLAGN && MAC80211_DEBUGFS

        depends on IWLWIFI && MAC80211_DEBUGFS

        ---help---

	  Enable creation of debugfs files for the iwlwifi drivers. This

	  is a low-impact option that allows getting insight into the
@@ -79,13 +45,13 @@ config IWLWIFI_DEBUGFS 


config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE

        bool "Experimental uCode support"

        depends on IWLAGN && IWLWIFI_DEBUG

        depends on IWLWIFI && IWLWIFI_DEBUG

        ---help---

	  Enable use of experimental ucode for testing and debugging.



config IWLWIFI_DEVICE_TRACING

	bool "iwlwifi device access tracing"

	depends on IWLAGN

	depends on IWLWIFI

	depends on EVENT_TRACING

	help

	  Say Y here to trace all commands, including TX frames and IO
@@ -102,9 +68,57 @@ config IWLWIFI_DEVICE_TRACING 
	  occur.

endmenu



config IWLAGN

	tristate "Intel Wireless WiFi Next Gen AGN (iwlagn)"

	depends on IWLWIFI

	---help---

	  Select to build the driver supporting the:



	  Intel Wireless WiFi Link Next-Gen AGN



	  This driver uses the kernel's mac80211 subsystem.



	  In order to use this driver, you will need a microcode (uCode)

	  image for it. You can obtain the microcode from:



	          <http://intellinuxwireless.org/>.



	  The microcode is typically installed in /lib/firmware. You can

	  look in the hotplug script /etc/hotplug/firmware.agent to

	  determine which directory FIRMWARE_DIR is set to when the script

	  runs.



	  If you want to compile the driver as a module ( = code which can be

	  inserted in and removed from the running kernel whenever you want),

	  say M here and read <file:Documentation/kbuild/modules.txt>.  The

	  module will be called iwlagn.





config IWL4965

	bool "Intel Wireless WiFi 4965AGN"

	depends on IWLAGN

	---help---

	  This option enables support for Intel Wireless WiFi Link 4965AGN



config IWL5000

	bool "Intel Wireless-N/Advanced-N/Ultimate-N WiFi Link"

	depends on IWLAGN

	---help---

	  This option enables support for use with the following hardware:

		Intel Wireless WiFi Link 6250AGN Adapter

		Intel 6000 Series Wi-Fi Adapters (6200AGN and 6300AGN)

		Intel WiFi Link 1000BGN

		Intel Wireless WiFi 5150AGN

		Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN

		Intel 6005 Series Wi-Fi Adapters

		Intel 6030 Series Wi-Fi Adapters

		Intel Wireless WiFi Link 6150BGN 2 Adapter

		Intel 100 Series Wi-Fi Adapters (100BGN and 130BGN)

		Intel 2000 Series Wi-Fi Adapters



config IWL_P2P

	bool "iwlwifi experimental P2P support"

	depends on IWLAGN

	depends on IWL5000

	help

	  This option enables experimental P2P support for some devices

	  based on microcode support. Since P2P support is still under
@@ -118,3 +132,27 @@ config IWL_P2P 


	  Say Y only if you want to experiment with P2P.



config IWL3945

	tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)"

	depends on IWLWIFI

	---help---

	  Select to build the driver supporting the:



	  Intel PRO/Wireless 3945ABG/BG Network Connection



	  This driver uses the kernel's mac80211 subsystem.



	  In order to use this driver, you will need a microcode (uCode)

	  image for it. You can obtain the microcode from:



	          <http://intellinuxwireless.org/>.



	  The microcode is typically installed in /lib/firmware. You can

	  look in the hotplug script /etc/hotplug/firmware.agent to

	  determine which directory FIRMWARE_DIR is set to when the script

	  runs.



	  If you want to compile the driver as a module ( = code which can be

	  inserted in and removed from the running kernel whenever you want),

	  say M here and read <file:Documentation/kbuild/modules.txt>.  The

	  module will be called iwl3945.

drivers/net/wireless/iwlwifi/Makefile

+26 −13
Original line number Diff line number Diff line 
obj-$(CONFIG_IWLWIFI)	+= iwlcore.o

iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o

iwlcore-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o

iwlcore-objs 		+= iwl-scan.o iwl-led.o

iwlcore-$(CONFIG_IWL3945) += iwl-legacy.o

iwlcore-$(CONFIG_IWL4965) += iwl-legacy.o

iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwlcore-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o



# If 3945 is selected only, iwl-legacy.o will be added

# to iwlcore-m above, but it needs to be built in.

iwlcore-objs += $(iwlcore-m)



CFLAGS_iwl-devtrace.o := -I$(src)



# AGN

obj-$(CONFIG_IWLAGN)	+= iwlagn.o

iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o iwl-agn-led.o

iwlagn-objs		+= iwl-agn-ucode.o iwl-agn-tx.o

iwlagn-objs		+= iwl-agn-lib.o iwl-agn-rx.o iwl-agn-calib.o

iwlagn-objs		+= iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o



iwlagn-objs 		+= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o

iwlagn-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o

iwlagn-objs 		+= iwl-scan.o iwl-led.o

iwlagn-objs             += iwl-agn-rxon.o iwl-agn-hcmd.o iwl-agn-ict.o

iwlagn-objs             += iwl-5000.o

iwlagn-objs             += iwl-6000.o

iwlagn-objs             += iwl-1000.o

iwlagn-objs             += iwl-2000.o



iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o

iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o



CFLAGS_iwl-devtrace.o := -I$(src)

iwlagn-$(CONFIG_IWL4965) += iwl-4965.o

iwlagn-$(CONFIG_IWL5000) += iwl-agn-rxon.o iwl-agn-hcmd.o iwl-agn-ict.o

iwlagn-$(CONFIG_IWL5000) += iwl-5000.o

iwlagn-$(CONFIG_IWL5000) += iwl-6000.o

iwlagn-$(CONFIG_IWL5000) += iwl-1000.o

iwlagn-$(CONFIG_IWL5000) += iwl-2000.o



# 3945

obj-$(CONFIG_IWL3945)	+= iwl3945.o

iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o

iwl3945-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-3945-debugfs.o



ccflags-y += -D__CHECK_ENDIAN__

drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c

0 → 100644
+522 −0

File added.

Preview size limit exceeded, changes collapsed.