RE: [built bug] drivers/net/wireless/iwlwifi/iwl-debugfs.c

[Winkler, Tomas]

>-----Original Message-----
>From: David Miller [mailto:davem@xxxxxxxxxxxxx]
>Sent: Sunday, April 20, 2008 4:09 AM
>To: mingo@xxxxxxx
>Cc: linville@xxxxxxxxxxxxx; Winkler, Tomas;
linux-kernel@xxxxxxxxxxxxxxx;
>kaber@xxxxxxxxx; torvalds@xxxxxxxxxxxxxxxxxxxx;
akpm@xxxxxxxxxxxxxxxxxxxx;
>netdev@xxxxxxxxxxxxxxx; netfilter-devel@xxxxxxxxxxxxxxx
>Subject: Re: [built bug] drivers/net/wireless/iwlwifi/iwl-debugfs.c
>
>From: Ingo Molnar <mingo@xxxxxxx>
>Date: Sat, 19 Apr 2008 15:56:02 +0200
>
>> 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'
>
>This should fix it, thanks for the report.
>
>Longer term, I seriously question the sanity of including iwl4964
>specific dumping into a debug module that is linked into both
>iwlwifi drivers :-/
>
>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@xxxxxxxxxxxxx>
>
>diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
>b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
>index 0f16f26..9a30e1d 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");
>

ACK
 		}
---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/