Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d270075 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: correct naming for failure reply tx status 



For failure tx status 0x90 and 0x91, give the correct name to reflect
the errors.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 0b7e5e85

drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -1009,11 +1009,11 @@ ssize_t iwl_reply_tx_error_read(struct file *file, 
				TX_STATUS_FAIL_INSUFFICIENT_CF_POLL),

			 priv->_agn.reply_tx_stats.insuff_cf_poll);

	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n",

			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_FW_DROP),

			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_PASSIVE_NO_RX),

			 priv->_agn.reply_tx_stats.fail_hw_drop);

	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t%u\n",

	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t%u\n",

			 iwl_get_tx_fail_reason(

				TX_STATUS_FAIL_STA_COLOR_MISMATCH_DROP),

				TX_STATUS_FAIL_NO_BEACON_ON_RADAR),

			 priv->_agn.reply_tx_stats.sta_color_mismatch);

	pos += scnprintf(buf + pos, bufsz - pos, "UNKNOWN:\t\t\t%u\n",

			 priv->_agn.reply_tx_stats.unknown);

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+2 −2
Original line number Diff line number Diff line
@@ -111,10 +111,10 @@ static void iwlagn_count_tx_err_status(struct iwl_priv *priv, u16 status) 
	case TX_STATUS_FAIL_INSUFFICIENT_CF_POLL:

		priv->_agn.reply_tx_stats.insuff_cf_poll++;

		break;

	case TX_STATUS_FAIL_FW_DROP:

	case TX_STATUS_FAIL_PASSIVE_NO_RX:

		priv->_agn.reply_tx_stats.fail_hw_drop++;

		break;

	case TX_STATUS_FAIL_STA_COLOR_MISMATCH_DROP:

	case TX_STATUS_FAIL_NO_BEACON_ON_RADAR:

		priv->_agn.reply_tx_stats.sta_color_mismatch++;

		break;

	default:

drivers/net/wireless/iwlwifi/iwl-commands.h

+2 −7
Original line number Diff line number Diff line
@@ -1820,13 +1820,8 @@ enum { 
	TX_STATUS_FAIL_TID_DISABLE = 0x8d,

	TX_STATUS_FAIL_FIFO_FLUSHED = 0x8e,

	TX_STATUS_FAIL_INSUFFICIENT_CF_POLL = 0x8f,

	/* uCode drop due to FW drop request */

	TX_STATUS_FAIL_FW_DROP = 0x90,

	/*

	 * uCode drop due to station color mismatch

	 * between tx command and station table

	 */

	TX_STATUS_FAIL_STA_COLOR_MISMATCH_DROP = 0x91,

	TX_STATUS_FAIL_PASSIVE_NO_RX = 0x90,

	TX_STATUS_FAIL_NO_BEACON_ON_RADAR = 0x91,

};



#define	TX_PACKET_MODE_REGULAR		0x0000

drivers/net/wireless/iwlwifi/iwl-tx.c

+2 −2
Original line number Diff line number Diff line
@@ -666,8 +666,8 @@ const char *iwl_get_tx_fail_reason(u32 status) 
		TX_STATUS_FAIL(TID_DISABLE);

		TX_STATUS_FAIL(FIFO_FLUSHED);

		TX_STATUS_FAIL(INSUFFICIENT_CF_POLL);

		TX_STATUS_FAIL(FW_DROP);

		TX_STATUS_FAIL(STA_COLOR_MISMATCH_DROP);

		TX_STATUS_FAIL(PASSIVE_NO_RX);

		TX_STATUS_FAIL(NO_BEACON_ON_RADAR);

	}



	return "UNKNOWN";