aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/mac80211/Config.in87
-rw-r--r--package/mac80211/Config.in.ath9k12
-rw-r--r--package/mac80211/Config.in.b4381
-rw-r--r--package/mac80211/Makefile18
4 files changed, 115 insertions, 83 deletions
diff --git a/package/mac80211/Config.in b/package/mac80211/Config.in
index d3e015a25b..35f01c8a80 100644
--- a/package/mac80211/Config.in
+++ b/package/mac80211/Config.in
@@ -1,81 +1,10 @@
# mac80211 configuration
-choice
- prompt "b43 firmware version"
- depends on PACKAGE_kmod-b43
- default B43_STABLE
- help
- This option allows you to select the version of the b43 firmware.
-
-config B43_STABLE
- bool "4.150.10.5 (stable)"
- help
- Stable firmware for BCM43xx devices.
-
- If unsure, select this.
-
-config B43_EXPERIMENTAL
- bool "4.178.10.4 (experimental)"
- help
- Experimental firmware for BCM43xx devices.
-
- This firmware is not tested as much as the "stable" firmware.
-
- If unsure, select the "stable" firmware.
-
-config B43_OPENFIRMWARE
- bool "Open FirmWare for WiFi networks"
- help
- Opensource firmware for BCM43xx devices.
-
- Do _not_ select this, unless you know what you are doing.
- The Opensource firmware is not suitable for embedded devices, yet.
- It does not support QoS, which is bad for AccessPoints.
- It does not support hardware crypto acceleration, which is a showstopper
- for embedded devices with low CPU resources.
-
- If unsure, select the "stable" firmware.
-
-endchoice
-
-config B43_FW_SQUASH
- bool "Remove unnecessary firmware files"
- depends on PACKAGE_kmod-b43 && !B43_OPENFIRMWARE
- help
- This options allows you to remove unnecessary b43 firmware files
- from the final rootfs image. This can reduce the rootfs size by
- up to 200k.
-
- Do _NOT_ use this option, if you don't know the core revision
- and/or PHY type of your wireless chip.
-
- If unsure, say N.
-
-config B43_FW_SQUASH_COREREVS
- string "Core revisions to include"
- depends on PACKAGE_kmod-b43 && B43_FW_SQUASH
- default "5,6,7,8,9,10"
- help
- This is a comma seperated list of core revision numbers.
- Example (keep files for rev5 only):
- 5
- Example (keep files for rev5 and rev11):
- 5,11
-
-config B43_FW_SQUASH_PHYTYPES
- string "PHY types to include"
- depends on PACKAGE_kmod-b43 && B43_FW_SQUASH
- default "G,LP,N"
- help
- This is a comma seperated list of PHY types:
- A => A-PHY
- AG => Dual A-PHY G-PHY
- G => G-PHY
- LP => LP-PHY
- N => N-PHY
-
- Example (keep files for G-PHY only):
- G
- Example (keep files for G-PHY and N-PHY):
- G,N
-
+config PACKAGE_MAC80211_DEBUGFS
+ bool "Export mac80211 internals in DebugFS"
+ depends on PACKAGE_kmod-mac80211
+ ---help---
+ Select this to see extensive information about
+ the internal state of mac80211 in debugfs.
+
+ Say N unless you know you need this.
diff --git a/package/mac80211/Config.in.ath9k b/package/mac80211/Config.in.ath9k
new file mode 100644
index 0000000000..91e5984c65
--- /dev/null
+++ b/package/mac80211/Config.in.ath9k
@@ -0,0 +1,12 @@
+# mac80211 configuration
+
+config PACKAGE_ATH9K_DEBUG
+ bool "ath9k debugging"
+ depends PACKAGE_kmod-ath9k && KERNEL_DEBUG_FS
+ ---help---
+ Say Y, if you need ath9k to display debug messages.
+ Pass the debug mask as a module parameter:
+
+ modprobe ath9k debug=0x00002000
+
+ Look in ath9k/core.h for possible debug masks
diff --git a/package/mac80211/Config.in.b43 b/package/mac80211/Config.in.b43
new file mode 100644
index 0000000000..f5399312cb
--- /dev/null
+++ b/package/mac80211/Config.in.b43
@@ -0,0 +1,81 @@
+# B43 configuration
+
+choice
+ prompt "b43 firmware version"
+ depends on PACKAGE_kmod-b43
+ default B43_STABLE
+ help
+ This option allows you to select the version of the b43 firmware.
+
+config B43_STABLE
+ bool "4.150.10.5 (stable)"
+ help
+ Stable firmware for BCM43xx devices.
+
+ If unsure, select this.
+
+config B43_EXPERIMENTAL
+ bool "4.178.10.4 (experimental)"
+ help
+ Experimental firmware for BCM43xx devices.
+
+ This firmware is not tested as much as the "stable" firmware.
+
+ If unsure, select the "stable" firmware.
+
+config B43_OPENFIRMWARE
+ bool "Open FirmWare for WiFi networks"
+ help
+ Opensource firmware for BCM43xx devices.
+
+ Do _not_ select this, unless you know what you are doing.
+ The Opensource firmware is not suitable for embedded devices, yet.
+ It does not support QoS, which is bad for AccessPoints.
+ It does not support hardware crypto acceleration, which is a showstopper
+ for embedded devices with low CPU resources.
+
+ If unsure, select the "stable" firmware.
+
+endchoice
+
+config B43_FW_SQUASH
+ bool "Remove unnecessary firmware files"
+ depends on PACKAGE_kmod-b43 && !B43_OPENFIRMWARE
+ help
+ This options allows you to remove unnecessary b43 firmware files
+ from the final rootfs image. This can reduce the rootfs size by
+ up to 200k.
+
+ Do _NOT_ use this option, if you don't know the core revision
+ and/or PHY type of your wireless chip.
+
+ If unsure, say N.
+
+config B43_FW_SQUASH_COREREVS
+ string "Core revisions to include"
+ depends on PACKAGE_kmod-b43 && B43_FW_SQUASH
+ default "5,6,7,8,9,10"
+ help
+ This is a comma seperated list of core revision numbers.
+ Example (keep files for rev5 only):
+ 5
+ Example (keep files for rev5 and rev11):
+ 5,11
+
+config B43_FW_SQUASH_PHYTYPES
+ string "PHY types to include"
+ depends on PACKAGE_kmod-b43 && B43_FW_SQUASH
+ default "G,LP,N"
+ help
+ This is a comma seperated list of PHY types:
+ A => A-PHY
+ AG => Dual A-PHY G-PHY
+ G => G-PHY
+ LP => LP-PHY
+ N => N-PHY
+
+ Example (keep files for G-PHY only):
+ G
+ Example (keep files for G-PHY and N-PHY):
+ G,N
+
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 98bb6c23f7..719863be2c 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=mac80211
PKG_VERSION:=2009-08-20
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_URL:= \
http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/08 \
http://wireless.kernel.org/download/compat-wireless-2.6
@@ -43,6 +43,10 @@ define KernelPackage/mac80211
AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211)
endef
+define KernelPackage/mac80211/config
+ source "$(SOURCE)/Config.in"
+endef
+
define KernelPackage/mac80211/description
Linux 802.11 Wireless Networking Stack
endef
@@ -298,6 +302,10 @@ This module adds support for wireless adapters based on
Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets.
endef
+define KernelPackage/ath9k/config
+ source "$(SOURCE)/Config.in.ath9k"
+endef
+
define KernelPackage/mac80211-hwsim
$(call KernelPackage/mac80211/Default)
TITLE:=mac80211 HW simulation device
@@ -396,7 +404,7 @@ $(call KernelPackage/b43-common)
endef
define KernelPackage/b43/config
- source "$(SOURCE)/Config.in"
+ source "$(SOURCE)/Config.in.b43"
endef
define KernelPackage/b43/description
@@ -422,7 +430,8 @@ BUILDFLAGS:= \
$(if $(CONFIG_PCI),-DCONFIG_SSB_SPROM) \
$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS) \
$(if $(CONFIG_HW_RANDOM),-DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG) \
- $(if $(CONFIG_DEBUG_FS), -DCONFIG_MAC80211_DEBUGFS) \
+ $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS) \
+ $(if $(CONFIG_PACKAGE_ATH9K_DEBUG),-DCONFIG_ATH9K_DEBUG) \
-D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
MAKE_OPTS:= \
@@ -433,7 +442,7 @@ MAKE_OPTS:= \
CONFIG_MAC80211_RC_PID=y \
CONFIG_MAC80211_RC_MINSTREL=y \
CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
- CONFIG_MAC80211_DEBUGFS=$(CONFIG_DEBUG_FS) \
+ CONFIG_MAC80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \
CONFIG_B43_PCMCIA=n CONFIG_B43_PIO=n \
CONFIG_B43_PCI_AUTOSELECT=$(if $(CONFIG_PCI),y) \
CONFIG_B43_PCICORE_AUTOSELECT=$(if $(CONFIG_PCI),y) \
@@ -450,6 +459,7 @@ MAKE_OPTS:= \
CONFIG_ATH_COMMON=$(if $(CONFIG_PACKAGE_kmod-ath),m) \
CONFIG_ATH5K=$(if $(CONFIG_PACKAGE_kmod-ath5k),m) \
CONFIG_ATH9K=$(if $(CONFIG_PACKAGE_kmod-ath9k),m) \
+ CONFIG_ATH9K_DEBUG=$(if $(CONFIG_PACKAGE_ATH9K_DEBUG),y) \
CONFIG_ZD1211RW=$(if $(CONFIG_PACKAGE_kmod-zd1211rw),m) \
CONFIG_P54_COMMON=$(if $(CONFIG_PACKAGE_kmod-p54-common),m) \
CONFIG_P54_PCI=$(if $(CONFIG_PACKAGE_kmod-p54-pci),m) \