iwlwifi: report error when detect failure during stop agg queue
This fix related to bug 1921 at http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1921 when detect error during stopping tx aggregation queue, report the error to help identify the problem. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
82127493a6
Коммит
a2f1cbebdc
|
@ -1077,7 +1077,7 @@ static int iwl5000_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
|
||||||
|
|
||||||
if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) ||
|
if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) ||
|
||||||
(IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) {
|
(IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) {
|
||||||
IWL_WARN(priv,
|
IWL_ERR(priv,
|
||||||
"queue number out of range: %d, must be %d to %d\n",
|
"queue number out of range: %d, must be %d to %d\n",
|
||||||
txq_id, IWL50_FIRST_AMPDU_QUEUE,
|
txq_id, IWL50_FIRST_AMPDU_QUEUE,
|
||||||
IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1);
|
IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1);
|
||||||
|
|
|
@ -1138,8 +1138,10 @@ int iwl_sta_rx_agg_stop(struct iwl_priv *priv, const u8 *addr, int tid)
|
||||||
int sta_id;
|
int sta_id;
|
||||||
|
|
||||||
sta_id = iwl_find_station(priv, addr);
|
sta_id = iwl_find_station(priv, addr);
|
||||||
if (sta_id == IWL_INVALID_STATION)
|
if (sta_id == IWL_INVALID_STATION) {
|
||||||
|
IWL_ERR(priv, "Invalid station for AGG tid %d\n", tid);
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
|
}
|
||||||
|
|
||||||
spin_lock_irqsave(&priv->sta_lock, flags);
|
spin_lock_irqsave(&priv->sta_lock, flags);
|
||||||
priv->stations[sta_id].sta.station_flags_msk = 0;
|
priv->stations[sta_id].sta.station_flags_msk = 0;
|
||||||
|
|
|
@ -1223,8 +1223,10 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid)
|
||||||
|
|
||||||
sta_id = iwl_find_station(priv, ra);
|
sta_id = iwl_find_station(priv, ra);
|
||||||
|
|
||||||
if (sta_id == IWL_INVALID_STATION)
|
if (sta_id == IWL_INVALID_STATION) {
|
||||||
|
IWL_ERR(priv, "Invalid station for AGG tid %d\n", tid);
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
|
}
|
||||||
|
|
||||||
if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_ON)
|
if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_ON)
|
||||||
IWL_WARN(priv, "Stopping AGG while state not IWL_AGG_ON\n");
|
IWL_WARN(priv, "Stopping AGG while state not IWL_AGG_ON\n");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче