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

Commit 063c5166 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: remove traffic log 



This is superseded by tracing and no longer needed.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent c98c8d99

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

+0 −1
Original line number Diff line number Diff line
@@ -969,7 +969,6 @@ static int iwlagn_rx_reply_rx(struct iwl_priv *priv, 
	/* Find max signal strength (dBm) among 3 antenna/receiver chains */

	rx_status.signal = iwlagn_calc_rssi(priv, phy_res);



	iwl_dbg_log_rx_data_frame(priv, len, header);

	IWL_DEBUG_STATS_LIMIT(priv, "Rssi %d, TSF %llu\n",

		rx_status.signal, (unsigned long long)rx_status.mactime);

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

+0 −1
Original line number Diff line number Diff line
@@ -396,7 +396,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 


	/* TODO need this for burst mode later on */

	iwlagn_tx_cmd_build_basic(priv, skb, tx_cmd, info, hdr, sta_id);

	iwl_dbg_log_tx_data_frame(priv, len, hdr);



	iwlagn_tx_cmd_build_rate(priv, tx_cmd, info, fc);

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

+4 −9
Original line number Diff line number Diff line
@@ -1545,7 +1545,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	}



	if (WARN_ON(!priv->lib))

		goto out_free_traffic_mem;

		goto out_free_hw;



	/*

	 * Populate the state variables that the transport layer needs
@@ -1609,9 +1609,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	IWL_DEBUG_INFO(priv, "BT channel inhibition is %s\n",

		       (priv->bt_ch_announce) ? "On" : "Off");



	if (iwl_alloc_traffic_mem(priv))

		IWL_ERR(priv, "Not enough memory to generate traffic log\n");



	/* these spin locks will be used in apm_ops.init and EEPROM access

	 * we should init now

	 */
@@ -1625,12 +1622,12 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
		priv->cfg->name, priv->trans->hw_rev);



	if (iwl_trans_start_hw(priv->trans))

		goto out_free_traffic_mem;

		goto out_free_hw;



	/* Read the EEPROM */

	if (iwl_eeprom_init(priv, priv->trans->hw_rev)) {

		IWL_ERR(priv, "Unable to init EEPROM\n");

		goto out_free_traffic_mem;

		goto out_free_hw;

	}

	/* Reset chip to save power until we load uCode during "up". */

	iwl_trans_stop_hw(priv->trans, false);
@@ -1745,8 +1742,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	iwl_uninit_drv(priv);

out_free_eeprom:

	iwl_eeprom_free(priv);

out_free_traffic_mem:

	iwl_free_traffic_mem(priv);

out_free_hw:

	ieee80211_free_hw(priv->hw);

out:

	op_mode = NULL;
@@ -1780,7 +1776,6 @@ void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode) 
	 * until now... */

	destroy_workqueue(priv->workqueue);

	priv->workqueue = NULL;

	iwl_free_traffic_mem(priv);



	iwl_uninit_drv(priv);

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

+0 −99
Original line number Diff line number Diff line
@@ -42,99 +42,6 @@ 


#ifdef CONFIG_IWLWIFI_DEBUGFS



#define IWL_TRAFFIC_DUMP_SIZE	(IWL_TRAFFIC_ENTRY_SIZE * IWL_TRAFFIC_ENTRIES)



void iwl_reset_traffic_log(struct iwl_priv *priv)

{

	priv->tx_traffic_idx = 0;

	priv->rx_traffic_idx = 0;

	if (priv->tx_traffic)

		memset(priv->tx_traffic, 0, IWL_TRAFFIC_DUMP_SIZE);

	if (priv->rx_traffic)

		memset(priv->rx_traffic, 0, IWL_TRAFFIC_DUMP_SIZE);

}



int iwl_alloc_traffic_mem(struct iwl_priv *priv)

{

	u32 traffic_size = IWL_TRAFFIC_DUMP_SIZE;



	if (iwl_have_debug_level(IWL_DL_TX)) {

		if (!priv->tx_traffic) {

			priv->tx_traffic =

				kzalloc(traffic_size, GFP_KERNEL);

			if (!priv->tx_traffic)

				return -ENOMEM;

		}

	}

	if (iwl_have_debug_level(IWL_DL_RX)) {

		if (!priv->rx_traffic) {

			priv->rx_traffic =

				kzalloc(traffic_size, GFP_KERNEL);

			if (!priv->rx_traffic)

				return -ENOMEM;

		}

	}

	iwl_reset_traffic_log(priv);

	return 0;

}



void iwl_free_traffic_mem(struct iwl_priv *priv)

{

	kfree(priv->tx_traffic);

	priv->tx_traffic = NULL;



	kfree(priv->rx_traffic);

	priv->rx_traffic = NULL;

}



void iwl_dbg_log_tx_data_frame(struct iwl_priv *priv,

		      u16 length, struct ieee80211_hdr *header)

{

	__le16 fc;

	u16 len;



	if (likely(!iwl_have_debug_level(IWL_DL_TX)))

		return;



	if (!priv->tx_traffic)

		return;



	fc = header->frame_control;

	if (ieee80211_is_data(fc)) {

		len = (length > IWL_TRAFFIC_ENTRY_SIZE)

		       ? IWL_TRAFFIC_ENTRY_SIZE : length;

		memcpy((priv->tx_traffic +

		       (priv->tx_traffic_idx * IWL_TRAFFIC_ENTRY_SIZE)),

		       header, len);

		priv->tx_traffic_idx =

			(priv->tx_traffic_idx + 1) % IWL_TRAFFIC_ENTRIES;

	}

}



void iwl_dbg_log_rx_data_frame(struct iwl_priv *priv,

		      u16 length, struct ieee80211_hdr *header)

{

	__le16 fc;

	u16 len;



	if (likely(!iwl_have_debug_level(IWL_DL_RX)))

		return;



	if (!priv->rx_traffic)

		return;



	fc = header->frame_control;

	if (ieee80211_is_data(fc)) {

		len = (length > IWL_TRAFFIC_ENTRY_SIZE)

		       ? IWL_TRAFFIC_ENTRY_SIZE : length;

		memcpy((priv->rx_traffic +

		       (priv->rx_traffic_idx * IWL_TRAFFIC_ENTRY_SIZE)),

		       header, len);

		priv->rx_traffic_idx =

			(priv->rx_traffic_idx + 1) % IWL_TRAFFIC_ENTRIES;

	}

}



const char *get_mgmt_string(int cmd)

{

#define IWL_CMD(x) case x: return #x
@@ -177,12 +84,6 @@ const char *get_ctrl_string(int cmd) 
#undef IWL_CMD

}



void iwl_clear_traffic_stats(struct iwl_priv *priv)

{

	memset(&priv->tx_stats, 0, sizeof(struct traffic_stats));

	memset(&priv->rx_stats, 0, sizeof(struct traffic_stats));

}



/*

 * if CONFIG_IWLWIFI_DEBUGFS defined, iwl_update_stats function will

 * record all the MGMT, CTRL and DATA pkt for both TX and Rx pass.

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

+1 −36
Original line number Diff line number Diff line
@@ -77,49 +77,14 @@ struct iwl_cmd; 
 ***************************/



#ifdef CONFIG_IWLWIFI_DEBUGFS

int iwl_alloc_traffic_mem(struct iwl_priv *priv);

void iwl_free_traffic_mem(struct iwl_priv *priv);

void iwl_dbg_log_tx_data_frame(struct iwl_priv *priv,

				u16 length, struct ieee80211_hdr *header);

void iwl_dbg_log_rx_data_frame(struct iwl_priv *priv,

				u16 length, struct ieee80211_hdr *header);

const char *get_mgmt_string(int cmd);

const char *get_ctrl_string(int cmd);

void iwl_clear_traffic_stats(struct iwl_priv *priv);

void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc,

		      u16 len);

void iwl_reset_traffic_log(struct iwl_priv *priv);



void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len);

#else

static inline int iwl_alloc_traffic_mem(struct iwl_priv *priv)

{

	return 0;

}

static inline void iwl_free_traffic_mem(struct iwl_priv *priv)

{

}

static inline void iwl_reset_traffic_log(struct iwl_priv *priv)

{

}

static inline void iwl_dbg_log_tx_data_frame(struct iwl_priv *priv,

		      u16 length, struct ieee80211_hdr *header)

{

}

static inline void iwl_dbg_log_rx_data_frame(struct iwl_priv *priv,

		      u16 length, struct ieee80211_hdr *header)

{

}

static inline void iwl_update_stats(struct iwl_priv *priv, bool is_tx,

				    __le16 fc, u16 len)

{

}

#endif



/*******************************************************************************

 * Scanning

 ******************************************************************************/

/* traffic log definitions */

#define IWL_TRAFFIC_ENTRIES	(256)

#define IWL_TRAFFIC_ENTRY_SIZE  (64)



#endif /* __iwl_core_h__ */