Skip to content

Commit 00e3913

Browse files
committed
Revert "firewire: Annotate struct fw_iso_packet with __counted_by()"
This reverts commit d315574. 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>
1 parent 06dcc4c commit 00e3913

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

include/linux/firewire.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,8 @@ struct fw_iso_packet {
462462
/* rx: Sync bit, wait for matching sy */
463463
u32 tag:2; /* tx: Tag in packet header */
464464
u32 sy:4; /* tx: Sy in packet header */
465-
u32 header_length:8; /* Length of immediate header */
466-
/* tx: Top of 1394 isoch. data_block */
467-
u32 header[] __counted_by(header_length);
465+
u32 header_length:8; /* Size of immediate header */
466+
u32 header[]; /* tx: Top of 1394 isoch. data_block */
468467
};
469468

470469
#define FW_ISO_CONTEXT_TRANSMIT 0

0 commit comments

Comments
 (0)