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

Commit a294b96f authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: use iwl_get_debug_level instead of iwl_debug_level 



The latter may return incomplete information.
For example, if one switched IWL_DL_TX on through sysfs, IWL_DL_TX bit would
have been set in priv->debug_level, but since iwl_alloc_traffic_mem looked at
iwl_debug_level only, it wouldn't have allocated the tx_traffic buffer.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f293bd1a

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

+4 −4
Original line number Diff line number Diff line
@@ -1398,7 +1398,7 @@ int iwl_alloc_traffic_mem(struct iwl_priv *priv) 
{

	u32 traffic_size = IWL_TRAFFIC_DUMP_SIZE;



	if (iwl_debug_level & IWL_DL_TX) {

	if (iwl_get_debug_level(priv) & IWL_DL_TX) {

		if (!priv->tx_traffic) {

			priv->tx_traffic =

				kzalloc(traffic_size, GFP_KERNEL);
@@ -1406,7 +1406,7 @@ int iwl_alloc_traffic_mem(struct iwl_priv *priv) 
				return -ENOMEM;

		}

	}

	if (iwl_debug_level & IWL_DL_RX) {

	if (iwl_get_debug_level(priv) & IWL_DL_RX) {

		if (!priv->rx_traffic) {

			priv->rx_traffic =

				kzalloc(traffic_size, GFP_KERNEL);
@@ -1433,7 +1433,7 @@ void iwl_dbg_log_tx_data_frame(struct iwl_priv *priv, 
	__le16 fc;

	u16 len;



	if (likely(!(iwl_debug_level & IWL_DL_TX)))

	if (likely(!(iwl_get_debug_level(priv) & IWL_DL_TX)))

		return;



	if (!priv->tx_traffic)
@@ -1457,7 +1457,7 @@ void iwl_dbg_log_rx_data_frame(struct iwl_priv *priv, 
	__le16 fc;

	u16 len;



	if (likely(!(iwl_debug_level & IWL_DL_RX)))

	if (likely(!(iwl_get_debug_level(priv) & IWL_DL_RX)))

		return;



	if (!priv->rx_traffic)

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

+2 −2
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static ssize_t iwl_dbgfs_traffic_log_read(struct file *file, 
				"q[%d]: read_ptr: %u, write_ptr: %u\n",

				cnt, q->read_ptr, q->write_ptr);

	}

	if (priv->tx_traffic && (iwl_debug_level & IWL_DL_TX)) {

	if (priv->tx_traffic && (iwl_get_debug_level(priv) & IWL_DL_TX)) {

		ptr = priv->tx_traffic;

		pos += scnprintf(buf + pos, bufsz - pos,

				"Tx Traffic idx: %u\n",	priv->tx_traffic_idx);
@@ -938,7 +938,7 @@ static ssize_t iwl_dbgfs_traffic_log_read(struct file *file, 
			"read: %u, write: %u\n",

			 rxq->read, rxq->write);



	if (priv->rx_traffic && (iwl_debug_level & IWL_DL_RX)) {

	if (priv->rx_traffic && (iwl_get_debug_level(priv) & IWL_DL_RX)) {

		ptr = priv->rx_traffic;

		pos += scnprintf(buf + pos, bufsz - pos,

				"Rx Traffic idx: %u\n",	priv->rx_traffic_idx);