Skip to content

Commit

Permalink
wireless: allow Atheros card to not depend on ath.ko
Browse files Browse the repository at this point in the history
There are 2 different things:
- sub-menu for "Atheros Wireless cards" family
- module ath.ko with common Atheros code

Until now, they both used to depend on the same Kconfig variable ATH_COMMON.
Thus, being "Atheros card" and "depending on ath.ko" was the same.

To allow module to belong to the
"Atheros Wireless cards" family but not use ath.ko,
2 conditions above need to be separated.

So, this patch introduce new Kconfig variable ATH_CARDS for belonging
to the "Atheros Wireless Cards" family; while ATH_COMMON becomes hidden
variable to express dependency on common Atheros code in ath.ko. Modules
that depend on this common code now express it by setting ATH_COMMON.

Right now, ath6kl do not depend on common code and thus do not set ATH_COMMON.

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Vladimir Kondratiev authored and John W. Linville committed Nov 30, 2012
1 parent a56c919 commit 23c1d7f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/wireless/ath/Kconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
menuconfig ATH_COMMON
config ATH_COMMON
tristate

menuconfig ATH_CARDS
tristate "Atheros Wireless Cards"
depends on CFG80211 && (!UML || BROKEN)
---help---
Expand All @@ -14,7 +17,7 @@ menuconfig ATH_COMMON

http://wireless.kernel.org/en/users/Drivers/Atheros

if ATH_COMMON
if ATH_CARDS

config ATH_DEBUG
bool "Atheros wireless debugging"
Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/ath/ar5523/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
config AR5523
tristate "Atheros AR5523 wireless driver support"
depends on MAC80211 && USB
select ATH_COMMON
select FW_LOADER
---help---
This module add support for AR5523 based USB dongles such as D-Link
Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/ath/ath5k/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
config ATH5K
tristate "Atheros 5xxx wireless cards support"
depends on (PCI || ATHEROS_AR231X) && MAC80211
select ATH_COMMON
select MAC80211_LEDS
select LEDS_CLASS
select NEW_LEDS
Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/ath/ath9k/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ config ATH9K_BTCOEX_SUPPORT
config ATH9K
tristate "Atheros 802.11n wireless cards support"
depends on MAC80211
select ATH_COMMON
select ATH9K_HW
select MAC80211_LEDS
select LEDS_CLASS
Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/ath/carl9170/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
config CARL9170
tristate "Linux Community AR9170 802.11n USB support"
depends on USB && MAC80211 && EXPERIMENTAL
select ATH_COMMON
select FW_LOADER
select CRC32
help
Expand Down

0 comments on commit 23c1d7f

Please sign in to comment.