On Sun, Jul 25, 2010 at 1:14 PM, Andy Lutomirski <luto@xxxxxxx> 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@xxxxxxx>
> ---
>
> 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
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
