summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2024-07-25 19:16:48 +0300
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>2024-07-27 04:28:28 +0300
commit00e3913b0416fe69d28745c0a2a340e2f76c219c (patch)
tree10cd6ec859f9ccc25d2c859ad0fafb17d94a6404
parent06dcc4c9baa9e92896f00d02ffa760c0988b4371 (diff)
downloadlinux-00e3913b0416fe69d28745c0a2a340e2f76c219c.tar.xz
Revert "firewire: Annotate struct fw_iso_packet with __counted_by()"
This reverts commit d3155742db89df3b3c96da383c400e6ff4d23c25. The header_length field is byte unit, thus it can not express the number of elements in header field. It seems that the argument for counted_by attribute can have no arithmetic expression, therefore this commit just reverts the issued commit. Suggested-by: Gustavo A. R. Silva <gustavoars@kernel.org> Link: https://lore.kernel.org/r/20240725161648.130404-1-o-takashi@sakamocchi.jp Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r--include/linux/firewire.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 00abe0e5d602..1cca14cf5652 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -462,9 +462,8 @@ struct fw_iso_packet {
/* rx: Sync bit, wait for matching sy */
u32 tag:2; /* tx: Tag in packet header */
u32 sy:4; /* tx: Sy in packet header */
- u32 header_length:8; /* Length of immediate header */
- /* tx: Top of 1394 isoch. data_block */
- u32 header[] __counted_by(header_length);
+ u32 header_length:8; /* Size of immediate header */
+ u32 header[]; /* tx: Top of 1394 isoch. data_block */
};
#define FW_ISO_CONTEXT_TRANSMIT 0