Merge branch 'wireless-next-2.6' of... (1c62c72b) · Commits · 戴 / test

drivers/net/wireless/iwlwifi/Kconfig

+4 −2

Original line number	Diff line number	Diff line
		@@ -30,9 +30,11 @@ config IWLWIFI_DEBUG

		config IWLWIFI_DEBUGFS
		bool "iwlagn debugfs support"
		depends on IWLWIFI && IWLWIFI_DEBUG && MAC80211_DEBUGFS
		depends on IWLWIFI && MAC80211_DEBUGFS
		---help---
		Enable creation of debugfs files for the iwlwifi drivers.
		Enable creation of debugfs files for the iwlwifi drivers. This
		is a low-impact option that allows getting insight into the
		driver's state at runtime.

		config IWLWIFI_DEVICE_TRACING
		bool "iwlwifi device access tracing"

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

+25 −3

Original line number	Diff line number	Diff line
		@@ -28,6 +28,28 @@

		#include "iwl-3945-debugfs.h"


		static int iwl3945_statistics_flag(struct iwl_priv priv, char buf, int bufsz)
		{
		int p = 0;

		p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n",
		le32_to_cpu(priv->_3945.statistics.flag));
		if (le32_to_cpu(priv->_3945.statistics.flag) &
		UCODE_STATISTICS_CLEAR_MSK)
		p += scnprintf(buf + p, bufsz - p,
		"\tStatistics have been cleared\n");
		p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",
		(le32_to_cpu(priv->_3945.statistics.flag) &
		UCODE_STATISTICS_FREQUENCY_MSK)
		? "2.4 GHz" : "5.2 GHz");
		p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",
		(le32_to_cpu(priv->_3945.statistics.flag) &
		UCODE_STATISTICS_NARROW_BAND_MSK)
		? "enabled" : "disabled");
		return p;
		}

		ssize_t iwl3945_ucode_rx_stats_read(struct file *file,
		char __user *user_buf,
		size_t count, loff_t *ppos)
		@@ -70,7 +92,7 @@ ssize_t iwl3945_ucode_rx_stats_read(struct file *file,
		max_cck = &priv->_3945.max_delta.rx.cck;
		max_general = &priv->_3945.max_delta.rx.general;

		pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
		pos += iwl3945_statistics_flag(priv, buf, bufsz);
		pos += scnprintf(buf + pos, bufsz - pos, "%-32s current"
		"acumulative delta max\n",
		"Statistics_Rx - OFDM:");
		@@ -331,7 +353,7 @@ ssize_t iwl3945_ucode_tx_stats_read(struct file *file,
		accum_tx = &priv->_3945.accum_statistics.tx;
		delta_tx = &priv->_3945.delta_statistics.tx;
		max_tx = &priv->_3945.max_delta.tx;
		pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
		pos += iwl3945_statistics_flag(priv, buf, bufsz);
		pos += scnprintf(buf + pos, bufsz - pos, "%-32s current"
		"acumulative delta max\n",
		"Statistics_Tx:");
		@@ -438,7 +460,7 @@ ssize_t iwl3945_ucode_general_stats_read(struct file *file,
		accum_div = &priv->_3945.accum_statistics.general.div;
		delta_div = &priv->_3945.delta_statistics.general.div;
		max_div = &priv->_3945.max_delta.general.div;
		pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
		pos += iwl3945_statistics_flag(priv, buf, bufsz);
		pos += scnprintf(buf + pos, bufsz - pos, "%-32s current"
		"acumulative delta max\n",
		"Statistics_General:");

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

+6 −9

Original line number	Diff line number	Diff line
		@@ -352,7 +352,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv,
		* RX handler implementations
		*
		*****************************************************************************/
		#ifdef CONFIG_IWLWIFI_DEBUG
		#ifdef CONFIG_IWLWIFI_DEBUGFS
		/*
		* based on the assumption of all statistics counter are in DWORD
		* FIXME: This function is for debugging, do not deal with
		@@ -460,7 +460,7 @@ void iwl3945_hw_rx_statistics(struct iwl_priv *priv,
		IWL_DEBUG_RX(priv, "Statistics notification received (%d vs %d).\n",
		(int)sizeof(struct iwl3945_notif_statistics),
		le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
		#ifdef CONFIG_IWLWIFI_DEBUG
		#ifdef CONFIG_IWLWIFI_DEBUGFS
		iwl3945_accumulative_statistics(priv, (__le32 *)&pkt->u.raw);
		#endif
		iwl_recover_from_statistics(priv, pkt);
		@@ -475,7 +475,7 @@ void iwl3945_reply_statistics(struct iwl_priv *priv,
		__le32 flag = (__le32 )&pkt->u.raw;

		if (le32_to_cpu(*flag) & UCODE_STATISTICS_CLEAR_MSK) {
		#ifdef CONFIG_IWLWIFI_DEBUG
		#ifdef CONFIG_IWLWIFI_DEBUGFS
		memset(&priv->_3945.accum_statistics, 0,
		sizeof(struct iwl3945_notif_statistics));
		memset(&priv->_3945.delta_statistics, 0,
		@@ -947,8 +947,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv,
		tx_cmd->supp_rates[1], tx_cmd->supp_rates[0]);
		}

		static u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id,
		u16 tx_rate, u8 flags)
		static u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id, u16 tx_rate)
		{
		unsigned long flags_spin;
		struct iwl_station_entry *station;
		@@ -962,10 +961,9 @@ static u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id,
		station->sta.sta.modify_mask = STA_MODIFY_TX_RATE_MSK;
		station->sta.rate_n_flags = cpu_to_le16(tx_rate);
		station->sta.mode = STA_CONTROL_MODIFY_MSK;

		iwl_send_add_sta(priv, &station->sta, CMD_ASYNC);
		spin_unlock_irqrestore(&priv->sta_lock, flags_spin);

		iwl_send_add_sta(priv, &station->sta, flags);
		IWL_DEBUG_RATE(priv, "SCALE sync station %d to rate %d\n",
		sta_id, tx_rate);
		return sta_id;
		@@ -2473,8 +2471,7 @@ static int iwl3945_manage_ibss_station(struct iwl_priv *priv,

		iwl3945_sync_sta(priv, vif_priv->ibss_bssid_sta_id,
		(priv->band == IEEE80211_BAND_5GHZ) ?
		IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP,
		CMD_ASYNC);
		IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP);
		iwl3945_rate_scale_init(priv->hw, vif_priv->ibss_bssid_sta_id);

		return 0;

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -1542,7 +1542,7 @@ static int iwl4965_hw_get_temperature(struct iwl_priv *priv)
		u32 R4;

		if (test_bit(STATUS_TEMPERATURE, &priv->status) &&
		(priv->statistics.flag & STATISTICS_REPLY_FLG_HT40_MODE_MSK)) {
		(priv->_agn.statistics.flag & STATISTICS_REPLY_FLG_HT40_MODE_MSK)) {
		IWL_DEBUG_TEMP(priv, "Running HT40 temperature calibration\n");
		R1 = (s32)le32_to_cpu(priv->card_alive_init.therm_r1[1]);
		R2 = (s32)le32_to_cpu(priv->card_alive_init.therm_r2[1]);
		@@ -1567,7 +1567,7 @@ static int iwl4965_hw_get_temperature(struct iwl_priv *priv)
		vt = sign_extend(R4, 23);
		else
		vt = sign_extend(
		le32_to_cpu(priv->statistics.general.temperature), 23);
		le32_to_cpu(priv->_agn.statistics.general.temperature), 23);

		IWL_DEBUG_TEMP(priv, "Calib values R[1-3]: %d %d %d R4: %d\n", R1, R2, R3, vt);

		@@ -2026,6 +2026,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
		int sta_id;
		int freed;
		u8 *qc = NULL;
		unsigned long flags;

		if ((index >= txq->q.n_bd) \|\| (iwl_queue_used(&txq->q, index) == 0)) {
		IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d "
		@@ -2050,10 +2051,10 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
		return;
		}

		spin_lock_irqsave(&priv->sta_lock, flags);
		if (txq->sched_retry) {
		const u32 scd_ssn = iwl4965_get_scd_ssn(tx_resp);
		struct iwl_ht_agg *agg = NULL;

		WARN_ON(!qc);

		agg = &priv->stations[sta_id].tid[tid].agg;
		@@ -2110,6 +2111,8 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
		iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);

		iwl_check_abort_status(priv, tx_resp->frame_count, status);

		spin_unlock_irqrestore(&priv->sta_lock, flags);
		}

		static int iwl4965_calc_rssi(struct iwl_priv *priv,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -260,7 +260,7 @@ static void iwl5150_temperature(struct iwl_priv *priv)
		u32 vt = 0;
		s32 offset = iwl_temp_calib_to_offset(priv);

		vt = le32_to_cpu(priv->statistics.general.temperature);
		vt = le32_to_cpu(priv->_agn.statistics.general.temperature);
		vt = vt / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF + offset;
		/* now vt hold the temperature in Kelvin */
		priv->temperature = KELVIN_TO_CELSIUS(vt);

Admin message