* [PATCH] rt2x00: print chip and firmware version by default
@ 2013-01-22 16:49 Stanislaw Gruszka
2013-01-22 18:58 ` Gertjan van Wingerde
0 siblings, 1 reply; 6+ messages in thread
From: Stanislaw Gruszka @ 2013-01-22 16:49 UTC (permalink / raw)
To: John W. Linville; +Cc: Xose Vazquez Perez, linux-wireless, users
Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Tested-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
drivers/net/wireless/rt2x00/rt2x00.h | 2 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 3e37c19..bef449c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -92,7 +92,7 @@
#define NOTICE(__dev, __msg, __args...) \
DEBUG_PRINTK(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
#define INFO(__dev, __msg, __args...) \
- DEBUG_PRINTK(__dev, KERN_INFO, "Info", __msg, ##__args)
+ DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
#define DEBUG(__dev, __msg, __args...) \
DEBUG_PRINTK(__dev, KERN_DEBUG, "Debug", __msg, ##__args)
#define EEPROM(__dev, __msg, __args...) \
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index ed7a1bb..20c6ecc 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -731,9 +731,9 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw,
queue->aifs = params->aifs;
queue->txop = params->txop;
- INFO(rt2x00dev,
- "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
- queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
+ DEBUG(rt2x00dev,
+ "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
+ queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
return 0;
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] rt2x00: print chip and firmware version by default
2013-01-22 16:49 [PATCH] rt2x00: print chip and firmware version by default Stanislaw Gruszka
@ 2013-01-22 18:58 ` Gertjan van Wingerde
2013-01-22 21:12 ` Xose Vazquez Perez
0 siblings, 1 reply; 6+ messages in thread
From: Gertjan van Wingerde @ 2013-01-22 18:58 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, Xose Vazquez Perez,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
Hi Stanislaw,
Sent from my iPad
On 22 jan. 2013, at 17:49, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
> Tested-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> ---
> drivers/net/wireless/rt2x00/rt2x00.h | 2 +-
> drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 3e37c19..bef449c 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -92,7 +92,7 @@
> #define NOTICE(__dev, __msg, __args...) \
> DEBUG_PRINTK(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
> #define INFO(__dev, __msg, __args...) \
> - DEBUG_PRINTK(__dev, KERN_INFO, "Info", __msg, ##__args)
> + DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
> #define DEBUG(__dev, __msg, __args...) \
> DEBUG_PRINTK(__dev, KERN_DEBUG, "Debug", __msg, ##__args)
> #define EEPROM(__dev, __msg, __args...) \
I think this change is good, but we should also change WARNING and NOTICE. Otherwise they won't be displayed if CONFIG_RT2X00_DEBUG is disabled, but INFO will, which would be strange.
> diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
> index ed7a1bb..20c6ecc 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00mac.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
> @@ -731,9 +731,9 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw,
> queue->aifs = params->aifs;
> queue->txop = params->txop;
>
> - INFO(rt2x00dev,
> - "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
> - queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
> + DEBUG(rt2x00dev,
> + "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d, TXop: %d.\n",
> + queue_idx, queue->cw_min, queue->cw_max, queue->aifs, queue->txop);
>
> return 0;
> }
> --
> 1.7.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rt2x00: print chip and firmware version by default
2013-01-22 18:58 ` Gertjan van Wingerde
@ 2013-01-22 21:12 ` Xose Vazquez Perez
2013-01-22 22:19 ` Stanislaw Gruszka
2013-01-22 22:22 ` Gertjan van Wingerde
0 siblings, 2 replies; 6+ messages in thread
From: Xose Vazquez Perez @ 2013-01-22 21:12 UTC (permalink / raw)
To: Gertjan van Wingerde
Cc: Stanislaw Gruszka, John W. Linville,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
On 01/22/2013 07:58 PM, Gertjan van Wingerde wrote:
> On 22 jan. 2013, at 17:49, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
>
>> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
>> Tested-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
>> ---
>> drivers/net/wireless/rt2x00/rt2x00.h | 2 +-
>> drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +++---
>> 2 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
>> index 3e37c19..bef449c 100644
>> --- a/drivers/net/wireless/rt2x00/rt2x00.h
>> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
>> @@ -92,7 +92,7 @@
>> #define NOTICE(__dev, __msg, __args...) \
>> DEBUG_PRINTK(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
>> #define INFO(__dev, __msg, __args...) \
>> - DEBUG_PRINTK(__dev, KERN_INFO, "Info", __msg, ##__args)
>> + DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
>> #define DEBUG(__dev, __msg, __args...) \
>> DEBUG_PRINTK(__dev, KERN_DEBUG, "Debug", __msg, ##__args)
>> #define EEPROM(__dev, __msg, __args...) \
>
> I think this change is good, but we should also change WARNING and
> NOTICE. Otherwise they won't be displayed if CONFIG_RT2X00_DEBUG is
> disabled, but INFO will, which would be strange.
I believe this patch is so useful and trivial enough to be included,
as is, in the next 3.8-rc .
The next steps can be done for 3.9
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rt2x00: print chip and firmware version by default
2013-01-22 21:12 ` Xose Vazquez Perez
@ 2013-01-22 22:19 ` Stanislaw Gruszka
2013-01-23 18:03 ` Gertjan van Wingerde
2013-01-22 22:22 ` Gertjan van Wingerde
1 sibling, 1 reply; 6+ messages in thread
From: Stanislaw Gruszka @ 2013-01-22 22:19 UTC (permalink / raw)
To: Xose Vazquez Perez
Cc: Gertjan van Wingerde, John W. Linville,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
On Tue, Jan 22, 2013 at 10:12:32PM +0100, Xose Vazquez Perez wrote:
> On 01/22/2013 07:58 PM, Gertjan van Wingerde wrote:
>
> > On 22 jan. 2013, at 17:49, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> >
> >> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
> >> Tested-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> >> ---
> >> drivers/net/wireless/rt2x00/rt2x00.h | 2 +-
> >> drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +++---
> >> 2 files changed, 4 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> >> index 3e37c19..bef449c 100644
> >> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> >> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> >> @@ -92,7 +92,7 @@
> >> #define NOTICE(__dev, __msg, __args...) \
> >> DEBUG_PRINTK(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
> >> #define INFO(__dev, __msg, __args...) \
> >> - DEBUG_PRINTK(__dev, KERN_INFO, "Info", __msg, ##__args)
> >> + DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
> >> #define DEBUG(__dev, __msg, __args...) \
> >> DEBUG_PRINTK(__dev, KERN_DEBUG, "Debug", __msg, ##__args)
> >> #define EEPROM(__dev, __msg, __args...) \
> >
>
> > I think this change is good, but we should also change WARNING and
> > NOTICE. Otherwise they won't be displayed if CONFIG_RT2X00_DEBUG is
> > disabled, but INFO will, which would be strange.
We have those "TX status report missed" messages which spam logs,
I think we should move them to DEBUG level then.
NOTICE is only used in suspend/resume, it should be DEBUG too and NOTICE
macro could be removed.
> I believe this patch is so useful and trivial enough to be included,
> as is, in the next 3.8-rc .
>
> The next steps can be done for 3.9
If Gertjan will be so kind and ACK this patch, I'll post further
changes as incremental patch :-)
Stanislaw
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rt2x00: print chip and firmware version by default
2013-01-22 22:19 ` Stanislaw Gruszka
@ 2013-01-23 18:03 ` Gertjan van Wingerde
0 siblings, 0 replies; 6+ messages in thread
From: Gertjan van Wingerde @ 2013-01-23 18:03 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: Xose Vazquez Perez, John W. Linville,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
Hi Stanislaw,
Sent from my iPad
On 22 jan. 2013, at 23:19, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
> On Tue, Jan 22, 2013 at 10:12:32PM +0100, Xose Vazquez Perez wrote:
>> On 01/22/2013 07:58 PM, Gertjan van Wingerde wrote:
>>
>>> On 22 jan. 2013, at 17:49, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
>>>
>>>> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
>>>> Tested-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
>>>> ---
>>>> drivers/net/wireless/rt2x00/rt2x00.h | 2 +-
>>>> drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +++---
>>>> 2 files changed, 4 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
>>>> index 3e37c19..bef449c 100644
>>>> --- a/drivers/net/wireless/rt2x00/rt2x00.h
>>>> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
>>>> @@ -92,7 +92,7 @@
>>>> #define NOTICE(__dev, __msg, __args...) \
>>>> DEBUG_PRINTK(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
>>>> #define INFO(__dev, __msg, __args...) \
>>>> - DEBUG_PRINTK(__dev, KERN_INFO, "Info", __msg, ##__args)
>>>> + DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
>>>> #define DEBUG(__dev, __msg, __args...) \
>>>> DEBUG_PRINTK(__dev, KERN_DEBUG, "Debug", __msg, ##__args)
>>>> #define EEPROM(__dev, __msg, __args...) \
>>
>>> I think this change is good, but we should also change WARNING and
>>> NOTICE. Otherwise they won't be displayed if CONFIG_RT2X00_DEBUG is
>>> disabled, but INFO will, which would be strange.
>
> We have those "TX status report missed" messages which spam logs,
> I think we should move them to DEBUG level then.
>
> NOTICE is only used in suspend/resume, it should be DEBUG too and NOTICE
> macro could be removed.
>
>> I believe this patch is so useful and trivial enough to be included,
>> as is, in the next 3.8-rc .
>>
>> The next steps can be done for 3.9
>
> If Gertjan will be so kind and ACK this patch, I'll post further
> changes as incremental patch :-)
As I mentioned to Xose already yesterday, I think this is only appropriate for -next, so we can do this properly. I can see this being handled as a series of patches, which first change the loglevels of the existing log lines, then remove NOTICE, and them change the macro of WARNING to not be covered by CONFIG_RT2X00_DEBUG.
---
Gertjan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rt2x00: print chip and firmware version by default
2013-01-22 21:12 ` Xose Vazquez Perez
2013-01-22 22:19 ` Stanislaw Gruszka
@ 2013-01-22 22:22 ` Gertjan van Wingerde
1 sibling, 0 replies; 6+ messages in thread
From: Gertjan van Wingerde @ 2013-01-22 22:22 UTC (permalink / raw)
To: Xose Vazquez Perez
Cc: Stanislaw Gruszka, John W. Linville,
linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
Xose,
Sent from my iPad
On 22 jan. 2013, at 22:12, Xose Vazquez Perez <xose.vazquez@gmail.com> wrote:
> On 01/22/2013 07:58 PM, Gertjan van Wingerde wrote:
>
>> On 22 jan. 2013, at 17:49, Stanislaw Gruszka <stf_xl@wp.pl> wrote:
>>
>>> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
>>> Tested-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
>>> ---
>>> drivers/net/wireless/rt2x00/rt2x00.h | 2 +-
>>> drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +++---
>>> 2 files changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
>>> index 3e37c19..bef449c 100644
>>> --- a/drivers/net/wireless/rt2x00/rt2x00.h
>>> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
>>> @@ -92,7 +92,7 @@
>>> #define NOTICE(__dev, __msg, __args...) \
>>> DEBUG_PRINTK(__dev, KERN_NOTICE, "Notice", __msg, ##__args)
>>> #define INFO(__dev, __msg, __args...) \
>>> - DEBUG_PRINTK(__dev, KERN_INFO, "Info", __msg, ##__args)
>>> + DEBUG_PRINTK_MSG(__dev, KERN_INFO, "Info", __msg, ##__args)
>>> #define DEBUG(__dev, __msg, __args...) \
>>> DEBUG_PRINTK(__dev, KERN_DEBUG, "Debug", __msg, ##__args)
>>> #define EEPROM(__dev, __msg, __args...) \
>
>> I think this change is good, but we should also change WARNING and
>> NOTICE. Otherwise they won't be displayed if CONFIG_RT2X00_DEBUG is
>> disabled, but INFO will, which would be strange.
>
> I believe this patch is so useful and trivial enough to be included,
> as is, in the next 3.8-rc .
>
> The next steps can be done for 3.9
To be honest, I wouldn't classify this as a bug, so 3.8-rc is out of the question. And doing a respin to add the other log levels can easily be done rather quickly, so there's no need to split it up.
---
Gertjan
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-23 18:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-22 16:49 [PATCH] rt2x00: print chip and firmware version by default Stanislaw Gruszka
2013-01-22 18:58 ` Gertjan van Wingerde
2013-01-22 21:12 ` Xose Vazquez Perez
2013-01-22 22:19 ` Stanislaw Gruszka
2013-01-23 18:03 ` Gertjan van Wingerde
2013-01-22 22:22 ` Gertjan van Wingerde
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).