diff mbox

[LEDE-DEV] Set ATH9K_STATION_STATISTICS when enabling ath9k debugging

Message ID 20160813100211.29999-1-toke@toke.dk
State Changes Requested
Delegated to: Felix Fietkau
Headers show

Commit Message

Toke Høiland-Jørgensen Aug. 13, 2016, 10:02 a.m. UTC
The ATH9K_STATION_STATISTICS kernel config variable enables some extra
statistics that are useful for debugging (in particular with the airtime
fairness patches enabled). This adds that kernel config when selecting
ath9k debugging.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
---
 package/kernel/mac80211/Makefile | 2 +-
 target/linux/generic/config-4.4  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Felix Fietkau Aug. 23, 2016, 9:48 a.m. UTC | #1
On 2016-08-13 12:02, Toke Høiland-Jørgensen wrote:
> The ATH9K_STATION_STATISTICS kernel config variable enables some extra
> statistics that are useful for debugging (in particular with the airtime
> fairness patches enabled). This adds that kernel config when selecting
> ath9k debugging.
> 
> Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
Missing "ath9k: " prefix in the subject.

> ---
>  package/kernel/mac80211/Makefile | 2 +-
>  target/linux/generic/config-4.4  | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
> index f2839cd..5c0ca3f 100644
> --- a/package/kernel/mac80211/Makefile
> +++ b/package/kernel/mac80211/Makefile
> @@ -1494,7 +1494,7 @@ config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_C
>  config-$(call config_package,airo) += AIRO
>  
>  config-$(call config_package,ath) += ATH_CARDS ATH_COMMON
> -config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG
> +config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG ATH9K_STATION_STATISTICS
>  config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
>  
>  config-$(call config_package,ath9k) += ATH9K
> diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4
> index 8c30017..2f12982 100644
> --- a/target/linux/generic/config-4.4
> +++ b/target/linux/generic/config-4.4
> @@ -276,6 +276,7 @@ CONFIG_ATA_SFF=y
>  # CONFIG_ATH9K is not set
>  # CONFIG_ATH9K_HTC is not set
>  # CONFIG_ATH_DEBUG is not set
> +# CONFIG_ATH9K_STATION_STATISTICS is not set
This change is completely useless, ath9k is never enabled in the kernel
config.

- Felix
Toke Høiland-Jørgensen Aug. 23, 2016, 9:55 a.m. UTC | #2
Felix Fietkau <nbd@nbd.name> writes:

> On 2016-08-13 12:02, Toke Høiland-Jørgensen wrote:
>> The ATH9K_STATION_STATISTICS kernel config variable enables some extra
>> statistics that are useful for debugging (in particular with the airtime
>> fairness patches enabled). This adds that kernel config when selecting
>> ath9k debugging.
>> 
>> Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
> Missing "ath9k: " prefix in the subject.

Noted.

>> ---
>>  package/kernel/mac80211/Makefile | 2 +-
>>  target/linux/generic/config-4.4  | 1 +
>>  2 files changed, 2 insertions(+), 1 deletion(-)
>> 
>> diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
>> index f2839cd..5c0ca3f 100644
>> --- a/package/kernel/mac80211/Makefile
>> +++ b/package/kernel/mac80211/Makefile
>> @@ -1494,7 +1494,7 @@ config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_C
>>  config-$(call config_package,airo) += AIRO
>>  
>>  config-$(call config_package,ath) += ATH_CARDS ATH_COMMON
>> -config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG
>> +config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG ATH9K_STATION_STATISTICS
>>  config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
>>  
>>  config-$(call config_package,ath9k) += ATH9K
>> diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4
>> index 8c30017..2f12982 100644
>> --- a/target/linux/generic/config-4.4
>> +++ b/target/linux/generic/config-4.4
>> @@ -276,6 +276,7 @@ CONFIG_ATA_SFF=y
>>  # CONFIG_ATH9K is not set
>>  # CONFIG_ATH9K_HTC is not set
>>  # CONFIG_ATH_DEBUG is not set
>> +# CONFIG_ATH9K_STATION_STATISTICS is not set
> This change is completely useless, ath9k is never enabled in the kernel
> config.

No, but if it's not in there, the mac80211 build disables it when
running `make allnoconfig` even if the Makefile sets it. Unless I've
missed some other way to prevent that?

-Toke
Felix Fietkau Aug. 23, 2016, 10:01 a.m. UTC | #3
On 2016-08-23 11:55, Toke Høiland-Jørgensen wrote:
>>> diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4
>>> index 8c30017..2f12982 100644
>>> --- a/target/linux/generic/config-4.4
>>> +++ b/target/linux/generic/config-4.4
>>> @@ -276,6 +276,7 @@ CONFIG_ATA_SFF=y
>>>  # CONFIG_ATH9K is not set
>>>  # CONFIG_ATH9K_HTC is not set
>>>  # CONFIG_ATH_DEBUG is not set
>>> +# CONFIG_ATH9K_STATION_STATISTICS is not set
>> This change is completely useless, ath9k is never enabled in the kernel
>> config.
> 
> No, but if it's not in there, the mac80211 build disables it when
> running `make allnoconfig` even if the Makefile sets it. Unless I've
> missed some other way to prevent that?
Aside from some generated bits, the mac80211 .config has nothing to do
with the kernel config. Also, since the kernel build calls make
oldconfig, this option will never actually end up being in the kernel
dir .config at all. Simply leave it out and it'll work just fine.

- Felix
Toke Høiland-Jørgensen Aug. 23, 2016, 10:05 a.m. UTC | #4
Felix Fietkau <nbd@nbd.name> writes:

> On 2016-08-23 11:55, Toke Høiland-Jørgensen wrote:
>>>> diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4
>>>> index 8c30017..2f12982 100644
>>>> --- a/target/linux/generic/config-4.4
>>>> +++ b/target/linux/generic/config-4.4
>>>> @@ -276,6 +276,7 @@ CONFIG_ATA_SFF=y
>>>>  # CONFIG_ATH9K is not set
>>>>  # CONFIG_ATH9K_HTC is not set
>>>>  # CONFIG_ATH_DEBUG is not set
>>>> +# CONFIG_ATH9K_STATION_STATISTICS is not set
>>> This change is completely useless, ath9k is never enabled in the kernel
>>> config.
>> 
>> No, but if it's not in there, the mac80211 build disables it when
>> running `make allnoconfig` even if the Makefile sets it. Unless I've
>> missed some other way to prevent that?
> Aside from some generated bits, the mac80211 .config has nothing to do
> with the kernel config. Also, since the kernel build calls make
> oldconfig, this option will never actually end up being in the kernel
> dir .config at all. Simply leave it out and it'll work just fine.

Well, it didn't when I tried. The generated .config had it in there, but
after running `make allnoconfig` it disappeared. I can go test again,
but I spent quite a while tearing my hair out before coming up with this
solution...

-Toke
Toke Høiland-Jørgensen Aug. 23, 2016, 10:35 a.m. UTC | #5
Toke Høiland-Jørgensen <toke@toke.dk> writes:

> Felix Fietkau <nbd@nbd.name> writes:
>
>> On 2016-08-23 11:55, Toke Høiland-Jørgensen wrote:
>>>>> diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4
>>>>> index 8c30017..2f12982 100644
>>>>> --- a/target/linux/generic/config-4.4
>>>>> +++ b/target/linux/generic/config-4.4
>>>>> @@ -276,6 +276,7 @@ CONFIG_ATA_SFF=y
>>>>>  # CONFIG_ATH9K is not set
>>>>>  # CONFIG_ATH9K_HTC is not set
>>>>>  # CONFIG_ATH_DEBUG is not set
>>>>> +# CONFIG_ATH9K_STATION_STATISTICS is not set
>>>> This change is completely useless, ath9k is never enabled in the kernel
>>>> config.
>>> 
>>> No, but if it's not in there, the mac80211 build disables it when
>>> running `make allnoconfig` even if the Makefile sets it. Unless I've
>>> missed some other way to prevent that?
>> Aside from some generated bits, the mac80211 .config has nothing to do
>> with the kernel config. Also, since the kernel build calls make
>> oldconfig, this option will never actually end up being in the kernel
>> dir .config at all. Simply leave it out and it'll work just fine.
>
> Well, it didn't when I tried. The generated .config had it in there, but
> after running `make allnoconfig` it disappeared. I can go test again,
> but I spent quite a while tearing my hair out before coming up with this
> solution...

OK, just tried again. Seems you're right; must've been removing the
kernel build dir while testing this that fixed things, not the actual
change. Will send a v2 :)

-Toke
diff mbox

Patch

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index f2839cd..5c0ca3f 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -1494,7 +1494,7 @@  config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_C
 config-$(call config_package,airo) += AIRO
 
 config-$(call config_package,ath) += ATH_CARDS ATH_COMMON
-config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG
+config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG ATH9K_STATION_STATISTICS
 config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
 
 config-$(call config_package,ath9k) += ATH9K
diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4
index 8c30017..2f12982 100644
--- a/target/linux/generic/config-4.4
+++ b/target/linux/generic/config-4.4
@@ -276,6 +276,7 @@  CONFIG_ATA_SFF=y
 # CONFIG_ATH9K is not set
 # CONFIG_ATH9K_HTC is not set
 # CONFIG_ATH_DEBUG is not set
+# CONFIG_ATH9K_STATION_STATISTICS is not set
 # CONFIG_ATL1 is not set
 # CONFIG_ATL1C is not set
 # CONFIG_ATL1E is not set