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

Commit e7392364 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka
Browse files

iwlegacy: indentions and whitespaces 



Process iwlegacy source files using:

indent -npro -l500 -nhnl
indent -npro -kr -i8 -ts8 -sob -l80 -nbbo -ss -ncs -cp1 -il0 -psl

Plus manual compilation fixes.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent f02579e3

drivers/net/wireless/iwlegacy/3945-debug.c

+340 −358
Original line number Diff line number Diff line
@@ -29,39 +29,37 @@ 
#include "common.h"

#include "3945.h"



static int il3945_stats_flag(struct il_priv *il, char *buf, int bufsz)

static int

il3945_stats_flag(struct il_priv *il, char *buf, int bufsz)

{

	int p = 0;



	p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n",

		       le32_to_cpu(il->_3945.stats.flag));

	if (le32_to_cpu(il->_3945.stats.flag) &

			UCODE_STATS_CLEAR_MSK)

	if (le32_to_cpu(il->_3945.stats.flag) & UCODE_STATS_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(il->_3945.stats.flag) &

			UCODE_STATS_FREQUENCY_MSK)

			? "2.4 GHz" : "5.2 GHz");

			UCODE_STATS_FREQUENCY_MSK) ? "2.4 GHz" : "5.2 GHz");

	p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",

		       (le32_to_cpu(il->_3945.stats.flag) &

			UCODE_STATS_NARROW_BAND_MSK)

			? "enabled" : "disabled");

			UCODE_STATS_NARROW_BAND_MSK) ? "enabled" : "disabled");

	return p;

}



ssize_t il3945_ucode_rx_stats_read(struct file *file,

				    char __user *user_buf,

ssize_t

il3945_ucode_rx_stats_read(struct file * file, char __user * user_buf,

			   size_t count, loff_t * ppos)

{

	struct il_priv *il = file->private_data;

	int pos = 0;

	char *buf;

	int bufsz = sizeof(struct iwl39_stats_rx_phy) * 40 +

	int bufsz =

	    sizeof(struct iwl39_stats_rx_phy) * 40 +

	    sizeof(struct iwl39_stats_rx_non_phy) * 40 + 400;

	ssize_t ret;

	struct iwl39_stats_rx_phy *ofdm, *accum_ofdm, *delta_ofdm,

					*max_ofdm;

	struct iwl39_stats_rx_phy *ofdm, *accum_ofdm, *delta_ofdm, *max_ofdm;

	struct iwl39_stats_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;

	struct iwl39_stats_rx_non_phy *general, *accum_general;

	struct iwl39_stats_rx_non_phy *delta_general, *max_general;
@@ -94,225 +92,215 @@ ssize_t il3945_ucode_rx_stats_read(struct file *file, 
	max_general = &il->_3945.max_delta.rx.general;



	pos += il3945_stats_flag(il, buf, bufsz);

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "%-32s     current"

		      "acumulative       delta         max\n",

		      "Statistics_Rx - OFDM:");

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "ina_cnt:", le32_to_cpu(ofdm->ina_cnt),

			 accum_ofdm->ina_cnt,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "ina_cnt:",

		      le32_to_cpu(ofdm->ina_cnt), accum_ofdm->ina_cnt,

		      delta_ofdm->ina_cnt, max_ofdm->ina_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "fina_cnt:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_cnt:",

		      le32_to_cpu(ofdm->fina_cnt), accum_ofdm->fina_cnt,

		      delta_ofdm->fina_cnt, max_ofdm->fina_cnt);

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

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "plcp_err:",

		      le32_to_cpu(ofdm->plcp_err), accum_ofdm->plcp_err,

		      delta_ofdm->plcp_err, max_ofdm->plcp_err);

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

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_err:",

		      le32_to_cpu(ofdm->crc32_err), accum_ofdm->crc32_err,

		      delta_ofdm->crc32_err, max_ofdm->crc32_err);

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

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "overrun_err:",

			 le32_to_cpu(ofdm->overrun_err),

			 accum_ofdm->overrun_err, delta_ofdm->overrun_err,

			 max_ofdm->overrun_err);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "early_overrun_err:",

		      le32_to_cpu(ofdm->overrun_err), accum_ofdm->overrun_err,

		      delta_ofdm->overrun_err, max_ofdm->overrun_err);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "early_overrun_err:",

		      le32_to_cpu(ofdm->early_overrun_err),

		      accum_ofdm->early_overrun_err,

		      delta_ofdm->early_overrun_err,

		      max_ofdm->early_overrun_err);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "crc32_good:", le32_to_cpu(ofdm->crc32_good),

			 accum_ofdm->crc32_good, delta_ofdm->crc32_good,

			 max_ofdm->crc32_good);

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

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_good:",

		      le32_to_cpu(ofdm->crc32_good), accum_ofdm->crc32_good,

		      delta_ofdm->crc32_good, max_ofdm->crc32_good);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "false_alarm_cnt:",

		      le32_to_cpu(ofdm->false_alarm_cnt),

			 accum_ofdm->false_alarm_cnt,

			 delta_ofdm->false_alarm_cnt,

		      accum_ofdm->false_alarm_cnt, delta_ofdm->false_alarm_cnt,

		      max_ofdm->false_alarm_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "fina_sync_err_cnt:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_sync_err_cnt:",

		      le32_to_cpu(ofdm->fina_sync_err_cnt),

		      accum_ofdm->fina_sync_err_cnt,

		      delta_ofdm->fina_sync_err_cnt,

		      max_ofdm->fina_sync_err_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "sfd_timeout:",

			 le32_to_cpu(ofdm->sfd_timeout),

			 accum_ofdm->sfd_timeout,

			 delta_ofdm->sfd_timeout,

			 max_ofdm->sfd_timeout);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "fina_timeout:",

			 le32_to_cpu(ofdm->fina_timeout),

			 accum_ofdm->fina_timeout,

			 delta_ofdm->fina_timeout,

			 max_ofdm->fina_timeout);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "unresponded_rts:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "sfd_timeout:",

		      le32_to_cpu(ofdm->sfd_timeout), accum_ofdm->sfd_timeout,

		      delta_ofdm->sfd_timeout, max_ofdm->sfd_timeout);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_timeout:",

		      le32_to_cpu(ofdm->fina_timeout), accum_ofdm->fina_timeout,

		      delta_ofdm->fina_timeout, max_ofdm->fina_timeout);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "unresponded_rts:",

		      le32_to_cpu(ofdm->unresponded_rts),

			 accum_ofdm->unresponded_rts,

			 delta_ofdm->unresponded_rts,

		      accum_ofdm->unresponded_rts, delta_ofdm->unresponded_rts,

		      max_ofdm->unresponded_rts);

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

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n",

		      "rxe_frame_lmt_ovrun:",

		      le32_to_cpu(ofdm->rxe_frame_limit_overrun),

		      accum_ofdm->rxe_frame_limit_overrun,

		      delta_ofdm->rxe_frame_limit_overrun,

		      max_ofdm->rxe_frame_limit_overrun);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "sent_ack_cnt:",

			 le32_to_cpu(ofdm->sent_ack_cnt),

			 accum_ofdm->sent_ack_cnt,

			 delta_ofdm->sent_ack_cnt,

			 max_ofdm->sent_ack_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "sent_cts_cnt:",

			 le32_to_cpu(ofdm->sent_cts_cnt),

			 accum_ofdm->sent_cts_cnt,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "sent_ack_cnt:",

		      le32_to_cpu(ofdm->sent_ack_cnt), accum_ofdm->sent_ack_cnt,

		      delta_ofdm->sent_ack_cnt, max_ofdm->sent_ack_cnt);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "sent_cts_cnt:",

		      le32_to_cpu(ofdm->sent_cts_cnt), accum_ofdm->sent_cts_cnt,

		      delta_ofdm->sent_cts_cnt, max_ofdm->sent_cts_cnt);



	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "%-32s     current"

		      "acumulative       delta         max\n",

		      "Statistics_Rx - CCK:");

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "ina_cnt:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "ina_cnt:",

		      le32_to_cpu(cck->ina_cnt), accum_cck->ina_cnt,

		      delta_cck->ina_cnt, max_cck->ina_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "fina_cnt:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_cnt:",

		      le32_to_cpu(cck->fina_cnt), accum_cck->fina_cnt,

		      delta_cck->fina_cnt, max_cck->fina_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "plcp_err:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "plcp_err:",

		      le32_to_cpu(cck->plcp_err), accum_cck->plcp_err,

		      delta_cck->plcp_err, max_cck->plcp_err);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "crc32_err:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_err:",

		      le32_to_cpu(cck->crc32_err), accum_cck->crc32_err,

		      delta_cck->crc32_err, max_cck->crc32_err);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "overrun_err:",

			 le32_to_cpu(cck->overrun_err),

			 accum_cck->overrun_err,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "overrun_err:",

		      le32_to_cpu(cck->overrun_err), accum_cck->overrun_err,

		      delta_cck->overrun_err, max_cck->overrun_err);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "early_overrun_err:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "early_overrun_err:",

		      le32_to_cpu(cck->early_overrun_err),

		      accum_cck->early_overrun_err,

			 delta_cck->early_overrun_err,

			 max_cck->early_overrun_err);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "crc32_good:",

		      delta_cck->early_overrun_err, max_cck->early_overrun_err);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_good:",

		      le32_to_cpu(cck->crc32_good), accum_cck->crc32_good,

			 delta_cck->crc32_good,

			 max_cck->crc32_good);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "false_alarm_cnt:",

		      delta_cck->crc32_good, max_cck->crc32_good);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "false_alarm_cnt:",

		      le32_to_cpu(cck->false_alarm_cnt),

			 accum_cck->false_alarm_cnt,

			 delta_cck->false_alarm_cnt, max_cck->false_alarm_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "fina_sync_err_cnt:",

		      accum_cck->false_alarm_cnt, delta_cck->false_alarm_cnt,

		      max_cck->false_alarm_cnt);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_sync_err_cnt:",

		      le32_to_cpu(cck->fina_sync_err_cnt),

		      accum_cck->fina_sync_err_cnt,

			 delta_cck->fina_sync_err_cnt,

			 max_cck->fina_sync_err_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "sfd_timeout:",

			 le32_to_cpu(cck->sfd_timeout),

			 accum_cck->sfd_timeout,

		      delta_cck->fina_sync_err_cnt, max_cck->fina_sync_err_cnt);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "sfd_timeout:",

		      le32_to_cpu(cck->sfd_timeout), accum_cck->sfd_timeout,

		      delta_cck->sfd_timeout, max_cck->sfd_timeout);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "fina_timeout:",

			 le32_to_cpu(cck->fina_timeout),

			 accum_cck->fina_timeout,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "fina_timeout:",

		      le32_to_cpu(cck->fina_timeout), accum_cck->fina_timeout,

		      delta_cck->fina_timeout, max_cck->fina_timeout);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "unresponded_rts:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "unresponded_rts:",

		      le32_to_cpu(cck->unresponded_rts),

			 accum_cck->unresponded_rts,

			 delta_cck->unresponded_rts,

		      accum_cck->unresponded_rts, delta_cck->unresponded_rts,

		      max_cck->unresponded_rts);

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

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n",

		      "rxe_frame_lmt_ovrun:",

		      le32_to_cpu(cck->rxe_frame_limit_overrun),

		      accum_cck->rxe_frame_limit_overrun,

		      delta_cck->rxe_frame_limit_overrun,

		      max_cck->rxe_frame_limit_overrun);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "sent_ack_cnt:",

			 le32_to_cpu(cck->sent_ack_cnt),

			 accum_cck->sent_ack_cnt,

			 delta_cck->sent_ack_cnt,

			 max_cck->sent_ack_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "sent_cts_cnt:",

			 le32_to_cpu(cck->sent_cts_cnt),

			 accum_cck->sent_cts_cnt,

			 delta_cck->sent_cts_cnt,

			 max_cck->sent_cts_cnt);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "sent_ack_cnt:",

		      le32_to_cpu(cck->sent_ack_cnt), accum_cck->sent_ack_cnt,

		      delta_cck->sent_ack_cnt, max_cck->sent_ack_cnt);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "sent_cts_cnt:",

		      le32_to_cpu(cck->sent_cts_cnt), accum_cck->sent_cts_cnt,

		      delta_cck->sent_cts_cnt, max_cck->sent_cts_cnt);



	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "%-32s     current"

		      "acumulative       delta         max\n",

		      "Statistics_Rx - GENERAL:");

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "bogus_cts:",

			 le32_to_cpu(general->bogus_cts),

			 accum_general->bogus_cts,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "bogus_cts:",

		      le32_to_cpu(general->bogus_cts), accum_general->bogus_cts,

		      delta_general->bogus_cts, max_general->bogus_cts);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "bogus_ack:",

			 le32_to_cpu(general->bogus_ack),

			 accum_general->bogus_ack,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "bogus_ack:",

		      le32_to_cpu(general->bogus_ack), accum_general->bogus_ack,

		      delta_general->bogus_ack, max_general->bogus_ack);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "non_bssid_frames:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "non_bssid_frames:",

		      le32_to_cpu(general->non_bssid_frames),

		      accum_general->non_bssid_frames,

		      delta_general->non_bssid_frames,

		      max_general->non_bssid_frames);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "filtered_frames:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "filtered_frames:",

		      le32_to_cpu(general->filtered_frames),

		      accum_general->filtered_frames,

		      delta_general->filtered_frames,

		      max_general->filtered_frames);

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

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n",

		      "non_channel_beacons:",

		      le32_to_cpu(general->non_channel_beacons),
@@ -325,8 +313,8 @@ ssize_t il3945_ucode_rx_stats_read(struct file *file, 
	return ret;

}



ssize_t il3945_ucode_tx_stats_read(struct file *file,

				    char __user *user_buf,

ssize_t

il3945_ucode_tx_stats_read(struct file * file, char __user * user_buf,

			   size_t count, loff_t * ppos)

{

	struct il_priv *il = file->private_data;
@@ -355,74 +343,68 @@ ssize_t il3945_ucode_tx_stats_read(struct file *file, 
	delta_tx = &il->_3945.delta_stats.tx;

	max_tx = &il->_3945.max_delta.tx;

	pos += il3945_stats_flag(il, buf, bufsz);

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "%-32s     current"

		      "acumulative       delta         max\n",

		      "Statistics_Tx:");

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "preamble:",

			 le32_to_cpu(tx->preamble_cnt),

			 accum_tx->preamble_cnt,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "preamble:",

		      le32_to_cpu(tx->preamble_cnt), accum_tx->preamble_cnt,

		      delta_tx->preamble_cnt, max_tx->preamble_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "rx_detected_cnt:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "rx_detected_cnt:",

		      le32_to_cpu(tx->rx_detected_cnt),

			 accum_tx->rx_detected_cnt,

			 delta_tx->rx_detected_cnt, max_tx->rx_detected_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "bt_prio_defer_cnt:",

		      accum_tx->rx_detected_cnt, delta_tx->rx_detected_cnt,

		      max_tx->rx_detected_cnt);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "bt_prio_defer_cnt:",

		      le32_to_cpu(tx->bt_prio_defer_cnt),

			 accum_tx->bt_prio_defer_cnt,

			 delta_tx->bt_prio_defer_cnt,

		      accum_tx->bt_prio_defer_cnt, delta_tx->bt_prio_defer_cnt,

		      max_tx->bt_prio_defer_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "bt_prio_kill_cnt:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "bt_prio_kill_cnt:",

		      le32_to_cpu(tx->bt_prio_kill_cnt),

			 accum_tx->bt_prio_kill_cnt,

			 delta_tx->bt_prio_kill_cnt,

		      accum_tx->bt_prio_kill_cnt, delta_tx->bt_prio_kill_cnt,

		      max_tx->bt_prio_kill_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "few_bytes_cnt:",

			 le32_to_cpu(tx->few_bytes_cnt),

			 accum_tx->few_bytes_cnt,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "few_bytes_cnt:",

		      le32_to_cpu(tx->few_bytes_cnt), accum_tx->few_bytes_cnt,

		      delta_tx->few_bytes_cnt, max_tx->few_bytes_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "cts_timeout:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "cts_timeout:",

		      le32_to_cpu(tx->cts_timeout), accum_tx->cts_timeout,

		      delta_tx->cts_timeout, max_tx->cts_timeout);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "ack_timeout:",

			 le32_to_cpu(tx->ack_timeout),

			 accum_tx->ack_timeout,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "ack_timeout:",

		      le32_to_cpu(tx->ack_timeout), accum_tx->ack_timeout,

		      delta_tx->ack_timeout, max_tx->ack_timeout);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "expected_ack_cnt:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "expected_ack_cnt:",

		      le32_to_cpu(tx->expected_ack_cnt),

			 accum_tx->expected_ack_cnt,

			 delta_tx->expected_ack_cnt,

		      accum_tx->expected_ack_cnt, delta_tx->expected_ack_cnt,

		      max_tx->expected_ack_cnt);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "actual_ack_cnt:",

			 le32_to_cpu(tx->actual_ack_cnt),

			 accum_tx->actual_ack_cnt,

			 delta_tx->actual_ack_cnt,

			 max_tx->actual_ack_cnt);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "actual_ack_cnt:",

		      le32_to_cpu(tx->actual_ack_cnt), accum_tx->actual_ack_cnt,

		      delta_tx->actual_ack_cnt, max_tx->actual_ack_cnt);



	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);

	kfree(buf);

	return ret;

}



ssize_t il3945_ucode_general_stats_read(struct file *file,

					 char __user *user_buf,

ssize_t

il3945_ucode_general_stats_read(struct file * file, char __user * user_buf,

				size_t count, loff_t * ppos)

{

	struct il_priv *il = file->private_data;
@@ -462,59 +444,59 @@ ssize_t il3945_ucode_general_stats_read(struct file *file, 
	delta_div = &il->_3945.delta_stats.general.div;

	max_div = &il->_3945.max_delta.general.div;

	pos += il3945_stats_flag(il, buf, bufsz);

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "%-32s     current"

		      "acumulative       delta         max\n",

		      "Statistics_General:");

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "burst_check:",

			 le32_to_cpu(dbg->burst_check),

			 accum_dbg->burst_check,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "burst_check:",

		      le32_to_cpu(dbg->burst_check), accum_dbg->burst_check,

		      delta_dbg->burst_check, max_dbg->burst_check);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "burst_count:",

			 le32_to_cpu(dbg->burst_count),

			 accum_dbg->burst_count,

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "burst_count:",

		      le32_to_cpu(dbg->burst_count), accum_dbg->burst_count,

		      delta_dbg->burst_count, max_dbg->burst_count);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "sleep_time:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "sleep_time:",

		      le32_to_cpu(general->sleep_time),

			 accum_general->sleep_time,

			 delta_general->sleep_time, max_general->sleep_time);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "slots_out:",

			 le32_to_cpu(general->slots_out),

			 accum_general->slots_out,

		      accum_general->sleep_time, delta_general->sleep_time,

		      max_general->sleep_time);

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "slots_out:",

		      le32_to_cpu(general->slots_out), accum_general->slots_out,

		      delta_general->slots_out, max_general->slots_out);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "slots_idle:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "slots_idle:",

		      le32_to_cpu(general->slots_idle),

			 accum_general->slots_idle,

			 delta_general->slots_idle, max_general->slots_idle);

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

		      accum_general->slots_idle, delta_general->slots_idle,

		      max_general->slots_idle);

	pos +=

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

		      le32_to_cpu(general->ttl_timestamp));

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "tx_on_a:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "tx_on_a:",

		      le32_to_cpu(div->tx_on_a), accum_div->tx_on_a,

		      delta_div->tx_on_a, max_div->tx_on_a);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "tx_on_b:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "tx_on_b:",

		      le32_to_cpu(div->tx_on_b), accum_div->tx_on_b,

		      delta_div->tx_on_b, max_div->tx_on_b);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "exec_time:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "exec_time:",

		      le32_to_cpu(div->exec_time), accum_div->exec_time,

		      delta_div->exec_time, max_div->exec_time);

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

			 "  %-30s %10u  %10u  %10u  %10u\n",

			 "probe_time:",

	pos +=

	    scnprintf(buf + pos, bufsz - pos,

		      "  %-30s %10u  %10u  %10u  %10u\n", "probe_time:",

		      le32_to_cpu(div->probe_time), accum_div->probe_time,

		      delta_div->probe_time, max_div->probe_time);

	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);

drivers/net/wireless/iwlegacy/3945-mac.c

+560 −583

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/iwlegacy/3945-rs.c

+126 −126

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/iwlegacy/3945.c

+459 −461

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/iwlegacy/3945.h

+57 −58
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ struct il3945_rs_sta { 
	int last_txrate_idx;

};





/*

 * The common struct MUST be first because it is shared between

 * 3945 and 4965!
@@ -186,7 +185,6 @@ struct il3945_ibss_seq { 
#define IL_RX_STATS(x) (&x->u.rx_frame.stats)

#define IL_RX_DATA(x) (IL_RX_HDR(x)->payload)





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

 *

 * Functions implemented in iwl3945-base.c which are forward declared here
@@ -197,7 +195,8 @@ extern int il3945_calc_db_from_ratio(int sig_ratio); 
extern void il3945_rx_replenish(void *data);

extern void il3945_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq);

extern unsigned int il3945_fill_beacon_frame(struct il_priv *il,

					struct ieee80211_hdr *hdr, int left);

					     struct ieee80211_hdr *hdr,

					     int left);

extern int il3945_dump_nic_event_log(struct il_priv *il, bool full_log,

				     char **buf, bool display);

extern void il3945_dump_nic_error_log(struct il_priv *il);
@@ -230,33 +229,28 @@ extern void il3945_hw_txq_ctx_stop(struct il_priv *il); 
extern int il3945_hw_nic_reset(struct il_priv *il);

extern int il3945_hw_txq_attach_buf_to_tfd(struct il_priv *il,

					   struct il_tx_queue *txq,

					    dma_addr_t addr, u16 len,

					    u8 reset, u8 pad);

extern void il3945_hw_txq_free_tfd(struct il_priv *il,

				    struct il_tx_queue *txq);

					   dma_addr_t addr, u16 len, u8 reset,

					   u8 pad);

extern void il3945_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq);

extern int il3945_hw_get_temperature(struct il_priv *il);

extern int il3945_hw_tx_queue_init(struct il_priv *il,

				struct il_tx_queue *txq);

extern int il3945_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq);

extern unsigned int il3945_hw_get_beacon_cmd(struct il_priv *il,

				 struct il3945_frame *frame, u8 rate);

void il3945_hw_build_tx_cmd_rate(struct il_priv *il,

				  struct il_device_cmd *cmd,

					     struct il3945_frame *frame,

					     u8 rate);

void il3945_hw_build_tx_cmd_rate(struct il_priv *il, struct il_device_cmd *cmd,

				 struct ieee80211_tx_info *info,

				  struct ieee80211_hdr *hdr,

				  int sta_id, int tx_id);

				 struct ieee80211_hdr *hdr, int sta_id,

				 int tx_id);

extern int il3945_hw_reg_send_txpower(struct il_priv *il);

extern int il3945_hw_reg_set_txpower(struct il_priv *il, s8 power);

extern void il3945_hdl_stats(struct il_priv *il,

				 struct il_rx_buf *rxb);

void il3945_hdl_c_stats(struct il_priv *il,

			      struct il_rx_buf *rxb);

extern void il3945_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb);

void il3945_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb);

extern void il3945_disable_events(struct il_priv *il);

extern int il4965_get_temperature(const struct il_priv *il);

extern void il3945_post_associate(struct il_priv *il);

extern void il3945_config_ap(struct il_priv *il);



extern int il3945_commit_rxon(struct il_priv *il,

			       struct il_rxon_context *ctx);

extern int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx);



/**

 * il3945_hw_find_station - Find station id for a given BSSID
@@ -275,8 +269,10 @@ extern int il3945_init_hw_rate_table(struct il_priv *il); 
extern void il3945_reg_txpower_periodic(struct il_priv *il);

extern int il3945_txpower_set_from_eeprom(struct il_priv *il);



extern const struct il_channel_info *il3945_get_channel_info(

	const struct il_priv *il, enum ieee80211_band band, u16 channel);

extern const struct il_channel_info *il3945_get_channel_info(const struct

							     il_priv *il,

							     enum ieee80211_band

							     band, u16 channel);



extern int il3945_rs_next_rate(struct il_priv *il, int rate);
@@ -287,8 +283,6 @@ void il3945_post_scan(struct il_priv *il); 
/* rates */

extern const struct il3945_rate_info il3945_rates[RATE_COUNT_3945];







/* RSSI to dBm */

#define IL39_RSSI_OFFSET	95
@@ -474,7 +468,8 @@ struct il3945_eeprom { 
/* Size of uCode instruction memory in bootstrap state machine */

#define IL39_MAX_BSM_SIZE IL39_RTC_INST_SIZE



static inline int il3945_hw_valid_rtc_data_addr(u32 addr)

static inline int

il3945_hw_valid_rtc_data_addr(u32 addr)

{

	return (addr >= IL39_RTC_DATA_LOWER_BOUND &&

		addr < IL39_RTC_DATA_UPPER_BOUND);
@@ -486,17 +481,20 @@ struct il3945_shared { 
	__le32 tx_base_ptr[8];

} __packed;



static inline u8 il3945_hw_get_rate(__le16 rate_n_flags)

static inline u8

il3945_hw_get_rate(__le16 rate_n_flags)

{

	return le16_to_cpu(rate_n_flags) & 0xFF;

}



static inline u16 il3945_hw_get_rate_n_flags(__le16 rate_n_flags)

static inline u16

il3945_hw_get_rate_n_flags(__le16 rate_n_flags)

{

	return le16_to_cpu(rate_n_flags);

}



static inline __le16 il3945_hw_set_rate_n_flags(u8 rate, u16 flags)

static inline __le16

il3945_hw_set_rate_n_flags(u8 rate, u16 flags)

{

	return cpu_to_le16((u16) rate | flags);

}
@@ -553,7 +551,6 @@ static inline __le16 il3945_hw_set_rate_n_flags(u8 rate, u16 flags) 
#define FH39_TSSR_MSG_CONFIG      (FH39_TSSR_TBL + 0x008)

#define FH39_TSSR_TX_STATUS       (FH39_TSSR_TBL + 0x010)





/* DBM */



#define FH39_SRVC_CHNL                            (6)
@@ -630,20 +627,22 @@ ssize_t il3945_ucode_general_stats_read(struct file *file, 
					char __user * user_buf, size_t count,

					loff_t * ppos);

#else

static ssize_t il3945_ucode_rx_stats_read(struct file *file,

					   char __user *user_buf, size_t count,

					   loff_t *ppos)

static ssize_t

il3945_ucode_rx_stats_read(struct file *file, char __user * user_buf,

			   size_t count, loff_t * ppos)

{

	return 0;

}

static ssize_t il3945_ucode_tx_stats_read(struct file *file,

					   char __user *user_buf, size_t count,

					   loff_t *ppos)



static ssize_t

il3945_ucode_tx_stats_read(struct file *file, char __user * user_buf,

			   size_t count, loff_t * ppos)

{

	return 0;

}

static ssize_t il3945_ucode_general_stats_read(struct file *file,

						char __user *user_buf,



static ssize_t

il3945_ucode_general_stats_read(struct file *file, char __user * user_buf,

				size_t count, loff_t * ppos)

{

	return 0;