2012-11-26 17:54:43

by Vladimir Kondratiev

[permalink] [raw]
Subject: Re: [PATCH v8 2/4] wireless: allow Atheros card to not depend on ath.ko

On Thursday, November 22, 2012 10:54:20 AM Luis R. Rodriguez wrote:


On Nov 22, 2012 8:41 AM, "Kalle Valo" <[email protected]> wrote:
>
> "Luis R. Rodriguez" <[email protected]> writes:
>
> >> > As was discussed, I prepared this patch that address Kconfig issue for the
> >> > Atheros wifi cards.
> >> >
> >> > Any opinions on this?
> >>
> >> Looks good to me, but I didn't check that carefully...
> >>
> >> Actually I think ath6kl can make use of this as well, it shouldn't
> >> depend anything from ath.ko.
> >
> > Indeed it should.
>
> -ECONFUSED :)
>
> Do you mean that ath6kl should or should not depend on ath.ko?
Should not.
Luis

Patch with ath6kl excluded follows.

> --
> Kalle Valo
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

>From 0a94dcf0b652d71dbcf079823f4b03cd14ddbc47 Mon Sep 17 00:00:00 2001
From: Vladimir Kondratiev <[email protected]>
Date: Mon, 26 Nov 2012 19:51:46 +0200
Subject: [PATCH] wireless: allow Atheros card to not depend on ath.ko

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 <[email protected]>
---
drivers/net/wireless/ath/Kconfig | 7 +++++--
drivers/net/wireless/ath/ar5523/Kconfig | 1 +
drivers/net/wireless/ath/ath5k/Kconfig | 1 +
drivers/net/wireless/ath/ath9k/Kconfig | 1 +
drivers/net/wireless/ath/carl9170/Kconfig | 1 +
5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig
index c25dcf1..1a67a4f 100644
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -1,4 +1,7 @@
-menuconfig ATH_COMMON
+config ATH_COMMON
+ tristate
+
+menuconfig ATH_CARDS
tristate "Atheros Wireless Cards"
depends on CFG80211 && (!UML || BROKEN)
---help---
@@ -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"
diff --git a/drivers/net/wireless/ath/ar5523/Kconfig b/drivers/net/wireless/ath/ar5523/Kconfig
index 11d99ee..0d320cc 100644
--- a/drivers/net/wireless/ath/ar5523/Kconfig
+++ b/drivers/net/wireless/ath/ar5523/Kconfig
@@ -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
diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig
index 338c5c4..c9f81a3 100644
--- a/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
@@ -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
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig
index c7aa664..5fc15bf 100644
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -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
diff --git a/drivers/net/wireless/ath/carl9170/Kconfig b/drivers/net/wireless/ath/carl9170/Kconfig
index 267d5dc..13a2045 100644
--- a/drivers/net/wireless/ath/carl9170/Kconfig
+++ b/drivers/net/wireless/ath/carl9170/Kconfig
@@ -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
--
1.7.10.4






2012-11-28 16:57:23

by Vladimir Kondratiev

[permalink] [raw]
Subject: [PATCH v2] wireless: allow Atheros card to not depend on ath.ko


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 <[email protected]>
---
drivers/net/wireless/ath/Kconfig | 7 +++++--
drivers/net/wireless/ath/ar5523/Kconfig | 1 +
drivers/net/wireless/ath/ath5k/Kconfig | 1 +
drivers/net/wireless/ath/ath9k/Kconfig | 1 +
drivers/net/wireless/ath/carl9170/Kconfig | 1 +
5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/Kconfig
b/drivers/net/wireless/ath/Kconfig
index c25dcf1..1a67a4f 100644
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -1,4 +1,7 @@
-menuconfig ATH_COMMON
+config ATH_COMMON
+ tristate
+
+menuconfig ATH_CARDS
tristate "Atheros Wireless Cards"
depends on CFG80211 && (!UML || BROKEN)
---help---
@@ -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"
diff --git a/drivers/net/wireless/ath/ar5523/Kconfig
b/drivers/net/wireless/ath/ar5523/Kconfig
index 11d99ee..0d320cc 100644
--- a/drivers/net/wireless/ath/ar5523/Kconfig
+++ b/drivers/net/wireless/ath/ar5523/Kconfig
@@ -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
diff --git a/drivers/net/wireless/ath/ath5k/Kconfig
b/drivers/net/wireless/ath/ath5k/Kconfig
index 338c5c4..c9f81a3 100644
--- a/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
@@ -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
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig
b/drivers/net/wireless/ath/ath9k/Kconfig
index c7aa664..5fc15bf 100644
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -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
diff --git a/drivers/net/wireless/ath/carl9170/Kconfig
b/drivers/net/wireless/ath/carl9170/Kconfig
index 267d5dc..13a2045 100644
--- a/drivers/net/wireless/ath/carl9170/Kconfig
+++ b/drivers/net/wireless/ath/carl9170/Kconfig
@@ -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
--
1.7.10.4



2012-11-28 13:57:21

by Kondratiev, Vladimir

[permalink] [raw]
Subject: Re: [PATCH v8 2/4] wireless: allow Atheros card to not depend on ath.ko

Hi,

What is the status of thie patch below? Anything need to be done by me?

Thanks, Vladimir


On Monday, November 26, 2012 07:54:38 PM Vladimir Kondratiev wrote:
> On Thursday, November 22, 2012 10:54:20 AM Luis R. Rodriguez wrote:
>
> On Nov 22, 2012 8:41 AM, "Kalle Valo" <[email protected]> wrote:
> > "Luis R. Rodriguez" <[email protected]> writes:
> > >> > As was discussed, I prepared this patch that address Kconfig issue
> > >> > for the
> > >> > Atheros wifi cards.
> > >> >
> > >> > Any opinions on this?
> > >>
> > >> Looks good to me, but I didn't check that carefully...
> > >>
> > >> Actually I think ath6kl can make use of this as well, it shouldn't
> > >> depend anything from ath.ko.
> > >
> > > Indeed it should.
> >
> > -ECONFUSED :)
> >
> > Do you mean that ath6kl should or should not depend on ath.ko?
>
> Should not.
> Luis
>
> Patch with ath6kl excluded follows.
>
> > --
> > Kalle Valo
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-wireless"
> > in the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> From 0a94dcf0b652d71dbcf079823f4b03cd14ddbc47 Mon Sep 17 00:00:00 2001
> From: Vladimir Kondratiev <[email protected]>
> Date: Mon, 26 Nov 2012 19:51:46 +0200
> Subject: [PATCH] wireless: allow Atheros card to not depend on ath.ko
>
> 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 <[email protected]>
> ---
> drivers/net/wireless/ath/Kconfig | 7 +++++--
> drivers/net/wireless/ath/ar5523/Kconfig | 1 +
> drivers/net/wireless/ath/ath5k/Kconfig | 1 +
> drivers/net/wireless/ath/ath9k/Kconfig | 1 +
> drivers/net/wireless/ath/carl9170/Kconfig | 1 +
> 5 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/Kconfig
> b/drivers/net/wireless/ath/Kconfig index c25dcf1..1a67a4f 100644
> --- a/drivers/net/wireless/ath/Kconfig
> +++ b/drivers/net/wireless/ath/Kconfig
> @@ -1,4 +1,7 @@
> -menuconfig ATH_COMMON
> +config ATH_COMMON
> + tristate
> +
> +menuconfig ATH_CARDS
> tristate "Atheros Wireless Cards"
> depends on CFG80211 && (!UML || BROKEN)
> ---help---
> @@ -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"
> diff --git a/drivers/net/wireless/ath/ar5523/Kconfig
> b/drivers/net/wireless/ath/ar5523/Kconfig index 11d99ee..0d320cc 100644
> --- a/drivers/net/wireless/ath/ar5523/Kconfig
> +++ b/drivers/net/wireless/ath/ar5523/Kconfig
> @@ -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 diff --git a/drivers/net/wireless/ath/ath5k/Kconfig
> b/drivers/net/wireless/ath/ath5k/Kconfig index 338c5c4..c9f81a3 100644
> --- a/drivers/net/wireless/ath/ath5k/Kconfig
> +++ b/drivers/net/wireless/ath/ath5k/Kconfig
> @@ -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
> diff --git a/drivers/net/wireless/ath/ath9k/Kconfig
> b/drivers/net/wireless/ath/ath9k/Kconfig index c7aa664..5fc15bf 100644
> --- a/drivers/net/wireless/ath/ath9k/Kconfig
> +++ b/drivers/net/wireless/ath/ath9k/Kconfig
> @@ -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
> diff --git a/drivers/net/wireless/ath/carl9170/Kconfig
> b/drivers/net/wireless/ath/carl9170/Kconfig index 267d5dc..13a2045 100644
> --- a/drivers/net/wireless/ath/carl9170/Kconfig
> +++ b/drivers/net/wireless/ath/carl9170/Kconfig
> @@ -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

2012-11-28 15:55:09

by Kondratiev, Vladimir

[permalink] [raw]
Subject: [PATCH v2] wireless: allow Atheros card to not depend on ath.ko


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 <[email protected]>
---
drivers/net/wireless/ath/Kconfig | 7 +++++--
drivers/net/wireless/ath/ar5523/Kconfig | 1 +
drivers/net/wireless/ath/ath5k/Kconfig | 1 +
drivers/net/wireless/ath/ath9k/Kconfig | 1 +
drivers/net/wireless/ath/carl9170/Kconfig | 1 +
5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig
index c25dcf1..1a67a4f 100644
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -1,4 +1,7 @@
-menuconfig ATH_COMMON
+config ATH_COMMON
+ tristate
+
+menuconfig ATH_CARDS
tristate "Atheros Wireless Cards"
depends on CFG80211 && (!UML || BROKEN)
---help---
@@ -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"
diff --git a/drivers/net/wireless/ath/ar5523/Kconfig b/drivers/net/wireless/ath/ar5523/Kconfig
index 11d99ee..0d320cc 100644
--- a/drivers/net/wireless/ath/ar5523/Kconfig
+++ b/drivers/net/wireless/ath/ar5523/Kconfig
@@ -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
diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig
index 338c5c4..c9f81a3 100644
--- a/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
@@ -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
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig
index c7aa664..5fc15bf 100644
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -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
diff --git a/drivers/net/wireless/ath/carl9170/Kconfig b/drivers/net/wireless/ath/carl9170/Kconfig
index 267d5dc..13a2045 100644
--- a/drivers/net/wireless/ath/carl9170/Kconfig
+++ b/drivers/net/wireless/ath/carl9170/Kconfig
@@ -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
--
1.7.10.4



2012-11-28 16:59:53

by Vladimir Kondratiev

[permalink] [raw]
Subject: Re: [PATCH v2] wireless: allow Atheros card to not depend on ath.ko

Sorry, patch was sent using wrong e-mail. Re-sent. Please, use one from
<[email protected]>
and ignore those from
<[email protected]>

Sorry for the mess

On Wednesday, November 28, 2012 05:53:18 PM Vladimir Kondratiev wrote:
> 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 <[email protected]>
> ---
> drivers/net/wireless/ath/Kconfig | 7 +++++--
> drivers/net/wireless/ath/ar5523/Kconfig | 1 +
> drivers/net/wireless/ath/ath5k/Kconfig | 1 +
> drivers/net/wireless/ath/ath9k/Kconfig | 1 +
> drivers/net/wireless/ath/carl9170/Kconfig | 1 +
> 5 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/Kconfig
> b/drivers/net/wireless/ath/Kconfig index c25dcf1..1a67a4f 100644
> --- a/drivers/net/wireless/ath/Kconfig
> +++ b/drivers/net/wireless/ath/Kconfig
> @@ -1,4 +1,7 @@
> -menuconfig ATH_COMMON
> +config ATH_COMMON
> + tristate
> +
> +menuconfig ATH_CARDS
> tristate "Atheros Wireless Cards"
> depends on CFG80211 && (!UML || BROKEN)
> ---help---
> @@ -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"
> diff --git a/drivers/net/wireless/ath/ar5523/Kconfig
> b/drivers/net/wireless/ath/ar5523/Kconfig index 11d99ee..0d320cc 100644
> --- a/drivers/net/wireless/ath/ar5523/Kconfig
> +++ b/drivers/net/wireless/ath/ar5523/Kconfig
> @@ -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 diff --git a/drivers/net/wireless/ath/ath5k/Kconfig
> b/drivers/net/wireless/ath/ath5k/Kconfig index 338c5c4..c9f81a3 100644
> --- a/drivers/net/wireless/ath/ath5k/Kconfig
> +++ b/drivers/net/wireless/ath/ath5k/Kconfig
> @@ -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
> diff --git a/drivers/net/wireless/ath/ath9k/Kconfig
> b/drivers/net/wireless/ath/ath9k/Kconfig index c7aa664..5fc15bf 100644
> --- a/drivers/net/wireless/ath/ath9k/Kconfig
> +++ b/drivers/net/wireless/ath/ath9k/Kconfig
> @@ -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
> diff --git a/drivers/net/wireless/ath/carl9170/Kconfig
> b/drivers/net/wireless/ath/carl9170/Kconfig index 267d5dc..13a2045 100644
> --- a/drivers/net/wireless/ath/carl9170/Kconfig
> +++ b/drivers/net/wireless/ath/carl9170/Kconfig
> @@ -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

2012-11-28 14:16:36

by John W. Linville

[permalink] [raw]
Subject: Re: [PATCH v8 2/4] wireless: allow Atheros card to not depend on ath.ko

On Wed, Nov 28, 2012 at 03:55:28PM +0200, Vladimir Kondratiev wrote:
> Hi,
>
> What is the status of thie patch below? Anything need to be done by me?
>
> Thanks, Vladimir

Please don't make me dig patches out of emails like this. Not only
does it take extra time/effort, but it also can be difficult to know
if someone actually wants the patch merged and or if they just want
to discuss a revision.

Instead, please repost the patch as a v2, in a separate message.

John

>
>
> On Monday, November 26, 2012 07:54:38 PM Vladimir Kondratiev wrote:
> > On Thursday, November 22, 2012 10:54:20 AM Luis R. Rodriguez wrote:
> >
> > On Nov 22, 2012 8:41 AM, "Kalle Valo" <[email protected]> wrote:
> > > "Luis R. Rodriguez" <[email protected]> writes:
> > > >> > As was discussed, I prepared this patch that address Kconfig issue
> > > >> > for the
> > > >> > Atheros wifi cards.
> > > >> >
> > > >> > Any opinions on this?
> > > >>
> > > >> Looks good to me, but I didn't check that carefully...
> > > >>
> > > >> Actually I think ath6kl can make use of this as well, it shouldn't
> > > >> depend anything from ath.ko.
> > > >
> > > > Indeed it should.
> > >
> > > -ECONFUSED :)
> > >
> > > Do you mean that ath6kl should or should not depend on ath.ko?
> >
> > Should not.
> > Luis
> >
> > Patch with ath6kl excluded follows.
> >
> > > --
> > > Kalle Valo
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe linux-wireless"
> > > in the body of a message to [email protected]
> > > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> > From 0a94dcf0b652d71dbcf079823f4b03cd14ddbc47 Mon Sep 17 00:00:00 2001
> > From: Vladimir Kondratiev <[email protected]>
> > Date: Mon, 26 Nov 2012 19:51:46 +0200
> > Subject: [PATCH] wireless: allow Atheros card to not depend on ath.ko
> >
> > 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 <[email protected]>
> > ---
> > drivers/net/wireless/ath/Kconfig | 7 +++++--
> > drivers/net/wireless/ath/ar5523/Kconfig | 1 +
> > drivers/net/wireless/ath/ath5k/Kconfig | 1 +
> > drivers/net/wireless/ath/ath9k/Kconfig | 1 +
> > drivers/net/wireless/ath/carl9170/Kconfig | 1 +
> > 5 files changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/wireless/ath/Kconfig
> > b/drivers/net/wireless/ath/Kconfig index c25dcf1..1a67a4f 100644
> > --- a/drivers/net/wireless/ath/Kconfig
> > +++ b/drivers/net/wireless/ath/Kconfig
> > @@ -1,4 +1,7 @@
> > -menuconfig ATH_COMMON
> > +config ATH_COMMON
> > + tristate
> > +
> > +menuconfig ATH_CARDS
> > tristate "Atheros Wireless Cards"
> > depends on CFG80211 && (!UML || BROKEN)
> > ---help---
> > @@ -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"
> > diff --git a/drivers/net/wireless/ath/ar5523/Kconfig
> > b/drivers/net/wireless/ath/ar5523/Kconfig index 11d99ee..0d320cc 100644
> > --- a/drivers/net/wireless/ath/ar5523/Kconfig
> > +++ b/drivers/net/wireless/ath/ar5523/Kconfig
> > @@ -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 diff --git a/drivers/net/wireless/ath/ath5k/Kconfig
> > b/drivers/net/wireless/ath/ath5k/Kconfig index 338c5c4..c9f81a3 100644
> > --- a/drivers/net/wireless/ath/ath5k/Kconfig
> > +++ b/drivers/net/wireless/ath/ath5k/Kconfig
> > @@ -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
> > diff --git a/drivers/net/wireless/ath/ath9k/Kconfig
> > b/drivers/net/wireless/ath/ath9k/Kconfig index c7aa664..5fc15bf 100644
> > --- a/drivers/net/wireless/ath/ath9k/Kconfig
> > +++ b/drivers/net/wireless/ath/ath9k/Kconfig
> > @@ -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
> > diff --git a/drivers/net/wireless/ath/carl9170/Kconfig
> > b/drivers/net/wireless/ath/carl9170/Kconfig index 267d5dc..13a2045 100644
> > --- a/drivers/net/wireless/ath/carl9170/Kconfig
> > +++ b/drivers/net/wireless/ath/carl9170/Kconfig
> > @@ -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
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2012-12-12 08:58:38

by Vladimir Kondratiev

[permalink] [raw]
Subject: [PATCH] wireless: fix Atheros drivers compilation

On Tuesday, December 11, 2012 09:28:32 PM Kalle Valo wrote:
> Vladimir Kondratiev <[email protected]> writes:
>
> > 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 <[email protected]>
>
> This broke ath6kl, it get compiled unless I enable ath9k or some other
> atheros driver.
>
> Reverting 23c1d7f6597 or adding "select ATH_COMMON" to ath6kl fixes
> this. Any ideas what's wrong? It's not obvious to me from looking at
> Kconfig files.

I found what is the problem. Patch follows

>From bb80d009b31c2b0751d156d6a653547107d490fa Mon Sep 17 00:00:00 2001
From: Vladimir Kondratiev <[email protected]>
Date: Wed, 12 Dec 2012 10:56:09 +0200
Subject: [PATCH] wireless: fix Atheros drivers compilation

Bug introduced in commit:
wireless: allow Atheros card to not depend on ath.ko

Change in CONFIG_ option name should be reflected in top level Makefile

Signed-off-by: Vladimir Kondratiev <[email protected]>
---
drivers/net/wireless/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 062dfdf..2ba8cb8 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -47,7 +47,7 @@ obj-$(CONFIG_RT2X00) += rt2x00/

obj-$(CONFIG_P54_COMMON) += p54/

-obj-$(CONFIG_ATH_COMMON) += ath/
+obj-$(CONFIG_ATH_CARDS) += ath/

obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o

--
1.7.10.4



2012-12-04 07:59:55

by Vladimir Kondratiev

[permalink] [raw]
Subject: Re: [PATCH v2] wireless: allow Atheros card to not depend on ath.ko

On Monday, December 03, 2012 08:46:44 AM John W. Linville wrote:
> It's in wireless-next ATM...
>

Thanks, John.

I had to fetch from wireless-testing before asking...

2012-12-03 13:03:06

by Vladimir Kondratiev

[permalink] [raw]
Subject: Re: [PATCH v2] wireless: allow Atheros card to not depend on ath.ko

Hi,

Any input?

Luis: does it reflect reality with Atheros drivers dependency now?

Thanks, Vladimir

On Wednesday, November 28, 2012 06:57:19 PM Vladimir Kondratiev wrote:
>
> 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 <[email protected]>
> ---
> drivers/net/wireless/ath/Kconfig | 7 +++++--
> drivers/net/wireless/ath/ar5523/Kconfig | 1 +
> drivers/net/wireless/ath/ath5k/Kconfig | 1 +
> drivers/net/wireless/ath/ath9k/Kconfig | 1 +
> drivers/net/wireless/ath/carl9170/Kconfig | 1 +
> 5 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/Kconfig
> b/drivers/net/wireless/ath/Kconfig
> index c25dcf1..1a67a4f 100644
> --- a/drivers/net/wireless/ath/Kconfig
> +++ b/drivers/net/wireless/ath/Kconfig
> @@ -1,4 +1,7 @@
> -menuconfig ATH_COMMON
> +config ATH_COMMON
> + tristate
> +
> +menuconfig ATH_CARDS
> tristate "Atheros Wireless Cards"
> depends on CFG80211 && (!UML || BROKEN)
> ---help---
> @@ -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"
> diff --git a/drivers/net/wireless/ath/ar5523/Kconfig
> b/drivers/net/wireless/ath/ar5523/Kconfig
> index 11d99ee..0d320cc 100644
> --- a/drivers/net/wireless/ath/ar5523/Kconfig
> +++ b/drivers/net/wireless/ath/ar5523/Kconfig
> @@ -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
> diff --git a/drivers/net/wireless/ath/ath5k/Kconfig
> b/drivers/net/wireless/ath/ath5k/Kconfig
> index 338c5c4..c9f81a3 100644
> --- a/drivers/net/wireless/ath/ath5k/Kconfig
> +++ b/drivers/net/wireless/ath/ath5k/Kconfig
> @@ -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
> diff --git a/drivers/net/wireless/ath/ath9k/Kconfig
> b/drivers/net/wireless/ath/ath9k/Kconfig
> index c7aa664..5fc15bf 100644
> --- a/drivers/net/wireless/ath/ath9k/Kconfig
> +++ b/drivers/net/wireless/ath/ath9k/Kconfig
> @@ -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
> diff --git a/drivers/net/wireless/ath/carl9170/Kconfig
> b/drivers/net/wireless/ath/carl9170/Kconfig
> index 267d5dc..13a2045 100644
> --- a/drivers/net/wireless/ath/carl9170/Kconfig
> +++ b/drivers/net/wireless/ath/carl9170/Kconfig
> @@ -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
>

2012-12-12 17:32:17

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH v2] wireless: fix Atheros drivers compilation

Vladimir Kondratiev <[email protected]> writes:

> OK, below same patch with explanation added. Good now?

Yup.

> From bb80d009b31c2b0751d156d6a653547107d490fa Mon Sep 17 00:00:00 2001
> From: Vladimir Kondratiev <[email protected]>
> Date: Wed, 12 Dec 2012 10:56:09 +0200
> Subject: [PATCH v2] wireless: fix Atheros drivers compilation
>
> Bug introduced in commit:
> wireless: allow Atheros card to not depend on ath.ko
>
> Commit in question changed CONFIG_ATH_COMMON to CONFIG_ATH_CARDS as
> "Atheros card" indication in drivers/net/wireless/ath/Kconfig but it
> is used also by drivers/net/wireless/Makefile
>
> If there are only Atheros cards that do not require ATH_COMMON, whole
> Makefile for Atheros cards was not executed; and as result, driver
> won't compile in this case.
>
> Change in CONFIG_ option name should be reflected in the
> drivers/net/wireless/Makefile
>
> Signed-off-by: Vladimir Kondratiev <[email protected]>

Tested-by: Kalle Valo <[email protected]>

John, so this patch should go to 3.8 as it's a regression.

Kalle

2012-12-03 14:01:39

by John W. Linville

[permalink] [raw]
Subject: Re: [PATCH v2] wireless: allow Atheros card to not depend on ath.ko

It's in wireless-next ATM...

commit 23c1d7f65975762386760e36c00f149059e537e2
Author: Vladimir Kondratiev <[email protected]>
Date: Wed Nov 28 18:57:19 2012 +0200

wireless: allow Atheros card to not depend on ath.ko

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 <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

On Mon, Dec 03, 2012 at 03:03:00PM +0200, Vladimir Kondratiev wrote:
> Hi,
>
> Any input?
>
> Luis: does it reflect reality with Atheros drivers dependency now?
>
> Thanks, Vladimir
>
> On Wednesday, November 28, 2012 06:57:19 PM Vladimir Kondratiev wrote:
> >
> > 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 <[email protected]>
> > ---
> > drivers/net/wireless/ath/Kconfig | 7 +++++--
> > drivers/net/wireless/ath/ar5523/Kconfig | 1 +
> > drivers/net/wireless/ath/ath5k/Kconfig | 1 +
> > drivers/net/wireless/ath/ath9k/Kconfig | 1 +
> > drivers/net/wireless/ath/carl9170/Kconfig | 1 +
> > 5 files changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/wireless/ath/Kconfig
> > b/drivers/net/wireless/ath/Kconfig
> > index c25dcf1..1a67a4f 100644
> > --- a/drivers/net/wireless/ath/Kconfig
> > +++ b/drivers/net/wireless/ath/Kconfig
> > @@ -1,4 +1,7 @@
> > -menuconfig ATH_COMMON
> > +config ATH_COMMON
> > + tristate
> > +
> > +menuconfig ATH_CARDS
> > tristate "Atheros Wireless Cards"
> > depends on CFG80211 && (!UML || BROKEN)
> > ---help---
> > @@ -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"
> > diff --git a/drivers/net/wireless/ath/ar5523/Kconfig
> > b/drivers/net/wireless/ath/ar5523/Kconfig
> > index 11d99ee..0d320cc 100644
> > --- a/drivers/net/wireless/ath/ar5523/Kconfig
> > +++ b/drivers/net/wireless/ath/ar5523/Kconfig
> > @@ -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
> > diff --git a/drivers/net/wireless/ath/ath5k/Kconfig
> > b/drivers/net/wireless/ath/ath5k/Kconfig
> > index 338c5c4..c9f81a3 100644
> > --- a/drivers/net/wireless/ath/ath5k/Kconfig
> > +++ b/drivers/net/wireless/ath/ath5k/Kconfig
> > @@ -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
> > diff --git a/drivers/net/wireless/ath/ath9k/Kconfig
> > b/drivers/net/wireless/ath/ath9k/Kconfig
> > index c7aa664..5fc15bf 100644
> > --- a/drivers/net/wireless/ath/ath9k/Kconfig
> > +++ b/drivers/net/wireless/ath/ath9k/Kconfig
> > @@ -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
> > diff --git a/drivers/net/wireless/ath/carl9170/Kconfig
> > b/drivers/net/wireless/ath/carl9170/Kconfig
> > index 267d5dc..13a2045 100644
> > --- a/drivers/net/wireless/ath/carl9170/Kconfig
> > +++ b/drivers/net/wireless/ath/carl9170/Kconfig
> > @@ -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
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2012-12-12 17:25:20

by Vladimir Kondratiev

[permalink] [raw]
Subject: [PATCH v2] wireless: fix Atheros drivers compilation

On Wednesday, December 12, 2012 07:08:06 PM Kalle Valo wrote:
> Hi,
>
> On 12/12/2012 10:58 AM, Vladimir Kondratiev wrote:
>
> > Subject: [PATCH] wireless: fix Atheros drivers compilation
> >
> > Bug introduced in commit:
> > wireless: allow Atheros card to not depend on ath.ko
> >
> > Change in CONFIG_ option name should be reflected in top level Makefile
>
> You should explain what the bug was (if ath6kl was the only enabled
> atheros driver it wasn't included in the compilation).
>
> > Signed-off-by: Vladimir Kondratiev <[email protected]>
>
> Thanks, this fixed it.
>
> Tested-by: Kalle Valo <[email protected]>
>
> John, as this bug is in wireless-next and is on it's way to 3.8, we
> should get this fix also to 3.8.
>
> Kalle
>

OK, below same patch with explanation added. Good now?

>From bb80d009b31c2b0751d156d6a653547107d490fa Mon Sep 17 00:00:00 2001
From: Vladimir Kondratiev <[email protected]>
Date: Wed, 12 Dec 2012 10:56:09 +0200
Subject: [PATCH v2] wireless: fix Atheros drivers compilation

Bug introduced in commit:
wireless: allow Atheros card to not depend on ath.ko

Commit in question changed CONFIG_ATH_COMMON to CONFIG_ATH_CARDS as
"Atheros card" indication in drivers/net/wireless/ath/Kconfig but it
is used also by drivers/net/wireless/Makefile

If there are only Atheros cards that do not require ATH_COMMON, whole
Makefile for Atheros cards was not executed; and as result, driver
won't compile in this case.

Change in CONFIG_ option name should be reflected in the
drivers/net/wireless/Makefile

Signed-off-by: Vladimir Kondratiev <[email protected]>
---
drivers/net/wireless/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 062dfdf..2ba8cb8 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -47,7 +47,7 @@ obj-$(CONFIG_RT2X00) += rt2x00/

obj-$(CONFIG_P54_COMMON) += p54/

-obj-$(CONFIG_ATH_COMMON) += ath/
+obj-$(CONFIG_ATH_CARDS) += ath/

obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o

--
1.7.10.4


2012-12-11 19:28:36

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH v2] wireless: allow Atheros card to not depend on ath.ko

Vladimir Kondratiev <[email protected]> writes:

> 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 <[email protected]>

This broke ath6kl, it get compiled unless I enable ath9k or some other
atheros driver.

Reverting 23c1d7f6597 or adding "select ATH_COMMON" to ath6kl fixes
this. Any ideas what's wrong? It's not obvious to me from looking at
Kconfig files.

--
Kalle Valo

2012-12-12 08:08:05

by Vladimir Kondratiev

[permalink] [raw]
Subject: Re: [PATCH v2] wireless: allow Atheros card to not depend on ath.ko

On Tuesday, December 11, 2012 09:28:32 PM Kalle Valo wrote:
> Vladimir Kondratiev <[email protected]> writes:
>
> > 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 <[email protected]>
>
> This broke ath6kl, it get compiled unless I enable ath9k or some other
> atheros driver.
>
> Reverting 23c1d7f6597 or adding "select ATH_COMMON" to ath6kl fixes
> this. Any ideas what's wrong? It's not obvious to me from looking at
> Kconfig files.
>

Interesting. I just compiled with ath6kl only, have no ATH_COMMON in .config.
Compiles with no problem.

Maybe something with your setup? Can you elaborate what error do you see?

Thanks, Vladimir

2012-12-12 17:08:07

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] wireless: fix Atheros drivers compilation

Hi,

On 12/12/2012 10:58 AM, Vladimir Kondratiev wrote:

> Subject: [PATCH] wireless: fix Atheros drivers compilation
>
> Bug introduced in commit:
> wireless: allow Atheros card to not depend on ath.ko
>
> Change in CONFIG_ option name should be reflected in top level Makefile

You should explain what the bug was (if ath6kl was the only enabled
atheros driver it wasn't included in the compilation).

> Signed-off-by: Vladimir Kondratiev <[email protected]>

Thanks, this fixed it.

Tested-by: Kalle Valo <[email protected]>

John, as this bug is in wireless-next and is on it's way to 3.8, we
should get this fix also to 3.8.

Kalle