* [PATCH 2.6.35] iwlagn: Improve aggregation failure error messages
@ 2010-07-25 17:14 Andy Lutomirski
2010-08-04 15:54 ` Andrew Lutomirski
0 siblings, 1 reply; 3+ messages in thread
From: Andy Lutomirski @ 2010-07-25 17:14 UTC (permalink / raw)
To: Wey-Yi Guy, ilw, linux-wireless, linville; +Cc: Andy Lutomirski
82ca9341763107615a15da6e59b9535d49eb91c3 added scary looking
but harmless error messages. Make them clearer and make the
actual failure message show up with the same severity as the
harmless one.
Signed-off-by: Andy Lutomirski <luto@mit.edu>
---
This is probably 2.6.35 material. There is no functional regression
here, but 2.6.34 worked pretty well and 2.6.35 *looks* like it's not
working if you read the logs.
There is no functional change in this patch.
Thanks,
Andy
drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index cf4a95b..f38ee24 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -300,8 +300,9 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
struct ieee80211_sta *sta)
{
int ret = -EAGAIN;
+ u32 load = rs_tl_get_load(lq_data, tid);
- if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) {
+ if (load > IWL_AGG_LOAD_THRESHOLD) {
IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
sta->addr, tid);
ret = ieee80211_start_tx_ba_session(sta, tid);
@@ -311,13 +312,15 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
* this might be cause by reloading firmware
* stop the tx ba session here
*/
- IWL_DEBUG_HT(priv, "Fail start Tx agg on tid: %d\n",
+ IWL_ERR(priv, "Fail start Tx agg on tid: %d\n",
tid);
ieee80211_stop_tx_ba_session(sta, tid,
WLAN_BACK_INITIATOR);
}
- } else
- IWL_ERR(priv, "Fail finding valid aggregation tid: %d\n", tid);
+ } else {
+ IWL_ERR(priv, "Aggregation not enabled for tid %d "
+ "because load = %u\n", tid, load);
+ }
return ret;
}
--
1.7.1.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2.6.35] iwlagn: Improve aggregation failure error messages
2010-07-25 17:14 [PATCH 2.6.35] iwlagn: Improve aggregation failure error messages Andy Lutomirski
@ 2010-08-04 15:54 ` Andrew Lutomirski
2010-08-04 16:05 ` Guy, Wey-Yi
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Lutomirski @ 2010-08-04 15:54 UTC (permalink / raw)
To: Wey-Yi Guy, ilw, linux-wireless, linville; +Cc: Andy Lutomirski
On Sun, Jul 25, 2010 at 1:14 PM, Andy Lutomirski <luto@mit.edu> wrote:
> 82ca9341763107615a15da6e59b9535d49eb91c3 added scary looking
> but harmless error messages. Make them clearer and make the
> actual failure message show up with the same severity as the
> harmless one.
>
> Signed-off-by: Andy Lutomirski <luto@mit.edu>
> ---
>
> This is probably 2.6.35 material. There is no functional regression
> here, but 2.6.34 worked pretty well and 2.6.35 *looks* like it's not
> working if you read the logs.
>
> There is no functional change in this patch.
Well, 2.6.35 has come and gone. Want to take it for 2.6.36 (it was
submitted in time AFAICT)?
--Andy
>
> Thanks,
> Andy
>
> drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 11 +++++++----
> 1 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
> index cf4a95b..f38ee24 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
> @@ -300,8 +300,9 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
> struct ieee80211_sta *sta)
> {
> int ret = -EAGAIN;
> + u32 load = rs_tl_get_load(lq_data, tid);
>
> - if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) {
> + if (load > IWL_AGG_LOAD_THRESHOLD) {
> IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
> sta->addr, tid);
> ret = ieee80211_start_tx_ba_session(sta, tid);
> @@ -311,13 +312,15 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
> * this might be cause by reloading firmware
> * stop the tx ba session here
> */
> - IWL_DEBUG_HT(priv, "Fail start Tx agg on tid: %d\n",
> + IWL_ERR(priv, "Fail start Tx agg on tid: %d\n",
> tid);
> ieee80211_stop_tx_ba_session(sta, tid,
> WLAN_BACK_INITIATOR);
> }
> - } else
> - IWL_ERR(priv, "Fail finding valid aggregation tid: %d\n", tid);
> + } else {
> + IWL_ERR(priv, "Aggregation not enabled for tid %d "
> + "because load = %u\n", tid, load);
> + }
> return ret;
> }
>
> --
> 1.7.1.1
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2.6.35] iwlagn: Improve aggregation failure error messages
2010-08-04 15:54 ` Andrew Lutomirski
@ 2010-08-04 16:05 ` Guy, Wey-Yi
0 siblings, 0 replies; 3+ messages in thread
From: Guy, Wey-Yi @ 2010-08-04 16:05 UTC (permalink / raw)
To: Andrew Lutomirski; +Cc: ilw, linux-wireless, linville
Hi Andy,
On Wed, 2010-08-04 at 08:54 -0700, Andrew Lutomirski wrote:
> On Sun, Jul 25, 2010 at 1:14 PM, Andy Lutomirski <luto@mit.edu> wrote:
> > 82ca9341763107615a15da6e59b9535d49eb91c3 added scary looking
> > but harmless error messages. Make them clearer and make the
> > actual failure message show up with the same severity as the
> > harmless one.
> >
> > Signed-off-by: Andy Lutomirski <luto@mit.edu>
> > ---
> >
> > This is probably 2.6.35 material. There is no functional regression
> > here, but 2.6.34 worked pretty well and 2.6.35 *looks* like it's not
> > working if you read the logs.
> >
> > There is no functional change in this patch.
>
> Well, 2.6.35 has come and gone. Want to take it for 2.6.36 (it was
> submitted in time AFAICT)?
>
Looks good to me.
Thanks
Wey
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-04 16:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-25 17:14 [PATCH 2.6.35] iwlagn: Improve aggregation failure error messages Andy Lutomirski
2010-08-04 15:54 ` Andrew Lutomirski
2010-08-04 16:05 ` Guy, Wey-Yi
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).