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

Commit 9077f218 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'wireless-next-2.6' of... 

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
parents 320d6c1b be663ab6

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ 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

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


obj-$(CONFIG_MWL8K)	+= mwl8k.o



obj-$(CONFIG_IWLWIFI)	+= iwlwifi/

obj-$(CONFIG_IWLAGN)	+= iwlwifi/

obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwlegacy/

obj-$(CONFIG_RT2X00)	+= rt2x00/



obj-$(CONFIG_P54_COMMON)	+= p54/

drivers/net/wireless/iwlegacy/Kconfig

0 → 100644
+116 −0
Original line number Diff line number Diff line 
config IWLWIFI_LEGACY

	tristate "Intel Wireless Wifi legacy devices"

	depends on PCI && MAC80211

	select FW_LOADER

	select NEW_LEDS

	select LEDS_CLASS

	select LEDS_TRIGGERS

	select MAC80211_LEDS



menu "Debugging Options"

	depends on IWLWIFI_LEGACY



config IWLWIFI_LEGACY_DEBUG

	bool "Enable full debugging output in 4965 and 3945 drivers"

	depends on IWLWIFI_LEGACY

	---help---

	  This option will enable debug tracing output for the iwlwifilegacy

	  drivers.



	  This will result in the kernel module being ~100k larger.  You can

	  control which debug output is sent to the kernel log by setting the

	  value in



		/sys/class/net/wlan0/device/debug_level



	  This entry will only exist if this option is enabled.



	  To set a value, simply echo an 8-byte hex value to the same file:



		  % echo 0x43fff > /sys/class/net/wlan0/device/debug_level



	  You can find the list of debug mask values in:

		  drivers/net/wireless/iwlwifilegacy/iwl-debug.h



	  If this is your first time using this driver, you should say Y here

	  as the debug information can assist others in helping you resolve

	  any problems you may encounter.



config IWLWIFI_LEGACY_DEBUGFS

        bool "4965 and 3945 debugfs support"

        depends on IWLWIFI_LEGACY && MAC80211_DEBUGFS

        ---help---

	  Enable creation of debugfs files for the iwlwifilegacy drivers. This

	  is a low-impact option that allows getting insight into the

	  driver's state at runtime.



config IWLWIFI_LEGACY_DEVICE_TRACING

	bool "iwlwifilegacy legacy device access tracing"

	depends on IWLWIFI_LEGACY

	depends on EVENT_TRACING

	help

	  Say Y here to trace all commands, including TX frames and IO

	  accesses, sent to the device. If you say yes, iwlwifilegacy will

	  register with the ftrace framework for event tracing and dump

	  all this information to the ringbuffer, you may need to

	  increase the ringbuffer size. See the ftrace documentation

	  for more information.



	  When tracing is not enabled, this option still has some

	  (though rather small) overhead.



	  If unsure, say Y so we can help you better when problems

	  occur.

endmenu



config IWL4965

	tristate "Intel Wireless WiFi 4965AGN (iwl4965)"

	depends on IWLWIFI_LEGACY

	---help---

	  This option enables support for



	  Select to build the driver supporting the:



	  Intel Wireless WiFi Link 4965AGN



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



config IWL3945

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

	depends on IWLWIFI_LEGACY

	---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/iwlegacy/Makefile

0 → 100644
+25 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwl-legacy.o

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

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

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

iwl-legacy-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-debugfs.o

iwl-legacy-$(CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING) += iwl-devtrace.o



iwl-legacy-objs += $(iwl-legacy-m)



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



# 4965

obj-$(CONFIG_IWL4965)	+= iwl4965.o

iwl4965-objs		:= iwl-4965.o iwl4965-base.o iwl-4965-rs.o iwl-4965-led.o

iwl4965-objs		+= iwl-4965-ucode.o iwl-4965-tx.o

iwl4965-objs		+= iwl-4965-lib.o iwl-4965-rx.o iwl-4965-calib.o

iwl4965-objs		+= iwl-4965-sta.o iwl-4965-eeprom.o

iwl4965-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-4965-debugfs.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_LEGACY_DEBUGFS) += iwl-3945-debugfs.o



ccflags-y += -D__CHECK_ENDIAN__

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

+6 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved.

 * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -60,12 +60,13 @@ ssize_t iwl3945_ucode_rx_stats_read(struct file *file, 
	int bufsz = sizeof(struct iwl39_statistics_rx_phy) * 40 +

		    sizeof(struct iwl39_statistics_rx_non_phy) * 40 + 400;

	ssize_t ret;

	struct iwl39_statistics_rx_phy *ofdm, *accum_ofdm, *delta_ofdm, *max_ofdm;

	struct iwl39_statistics_rx_phy *ofdm, *accum_ofdm, *delta_ofdm,

					*max_ofdm;

	struct iwl39_statistics_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;

	struct iwl39_statistics_rx_non_phy *general, *accum_general;

	struct iwl39_statistics_rx_non_phy *delta_general, *max_general;



	if (!iwl_is_alive(priv))

	if (!iwl_legacy_is_alive(priv))

		return -EAGAIN;



	buf = kzalloc(bufsz, GFP_KERNEL);
@@ -335,7 +336,7 @@ ssize_t iwl3945_ucode_tx_stats_read(struct file *file, 
	ssize_t ret;

	struct iwl39_statistics_tx *tx, *accum_tx, *delta_tx, *max_tx;



	if (!iwl_is_alive(priv))

	if (!iwl_legacy_is_alive(priv))

		return -EAGAIN;



	buf = kzalloc(bufsz, GFP_KERNEL);
@@ -434,7 +435,7 @@ ssize_t iwl3945_ucode_general_stats_read(struct file *file, 
	struct statistics_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;

	struct iwl39_statistics_div *div, *accum_div, *delta_div, *max_div;



	if (!iwl_is_alive(priv))

	if (!iwl_legacy_is_alive(priv))

		return -EAGAIN;



	buf = kzalloc(bufsz, GFP_KERNEL);