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

Commit 344234de authored by David S. Miller's avatar David S. Miller
Browse files

iwlwifi: Fix unconditional access to station->tidp[].agg. 



Reportred by Ingo Molnar:

drivers/net/wireless/iwlwifi/iwl-debugfs.c: In function 'iwl_dbgfs_stations_read':
drivers/net/wireless/iwlwifi/iwl-debugfs.c:256: error: 'struct iwl4965_tid_data' has no member named 'agg'

Needs CONFIG_IWL4965_HT protection.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1f9a464

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

+12 −6
Original line number Diff line number Diff line
@@ -239,28 +239,34 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf, 
					"ps_status: %u\n", station->ps_status);

			pos += scnprintf(buf + pos, bufsz - pos, "tid data:\n");

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

					"seq_num\t\ttxq_id\t");

					"seq_num\t\ttxq_id");

#ifdef CONFIG_IWL4965_HT

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

					"frame_count\twait_for_ba\t");

					"\tframe_count\twait_for_ba\t");

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

					"start_idx\tbitmap0\t");

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

					"bitmap1\trate_n_flags\n");

					"bitmap1\trate_n_flags");

#endif

			pos += scnprintf(buf + pos, bufsz - pos, "\n");



			for (j = 0; j < MAX_TID_COUNT; j++) {

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

						"[%d]:\t\t%u\t", j,

						"[%d]:\t\t%u", j,

						station->tid[j].seq_number);

#ifdef CONFIG_IWL4965_HT

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

						"%u\t\t%u\t\t%u\t\t",

						"\t%u\t\t%u\t\t%u\t\t",

						station->tid[j].agg.txq_id,

						station->tid[j].agg.frame_count,

						station->tid[j].agg.wait_for_ba);

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

						"%u\t%llu\t%u\n",

						"%u\t%llu\t%u",

						station->tid[j].agg.start_idx,

						(unsigned long long)station->tid[j].agg.bitmap,

						station->tid[j].agg.rate_n_flags);

#endif

				pos += scnprintf(buf + pos, bufsz - pos, "\n");

			}

			pos += scnprintf(buf + pos, bufsz - pos, "\n");

		}