summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-19 18:09:39 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-19 18:09:39 -0700
commit344234de54891ed15bf8127e4640ff9238076d6c (patch)
tree4f2581b2629b52b22958d7d3d4e64ce409c96125 /drivers/net/wireless
parente1f9a464026011b3f7d0f7b6dfab3e562e870a46 (diff)
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-debugfs.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index 0f16f2606f29..9a30e1df311d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -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");
}