projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
06dcc4c
)
Revert "firewire: Annotate struct fw_iso_packet with __counted_by()"
author
Takashi Sakamoto
<o-takashi@sakamocchi.jp>
Thu, 25 Jul 2024 16:16:48 +0000
(
01:16
+0900)
committer
Takashi Sakamoto
<o-takashi@sakamocchi.jp>
Sat, 27 Jul 2024 01:28:28 +0000
(10:28 +0900)
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>
include/linux/firewire.h
patch
|
blob
|
history
diff --git
a/include/linux/firewire.h
b/include/linux/firewire.h
index 00abe0e5d602bc8d51545aae2bc3c60c6f0c9f4f..1cca14cf56527be1d1e4f45d8ccfae8a86c66a7a 100644
(file)
--- 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