mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sctp: delete the nested flexible array skip

Browse source 
This patch deletes the flexible-array skip[] from the structure
sctp_ifwdtsn/fwdtsn_hdr to avoid some sparse warnings:

  # make C=2 CF="-Wflexible-array-nested" M=./net/sctp/
  net/sctp/stream_interleave.c: note: in included file (through include/net/sctp/structs.h, include/net/sctp/sctp.h):
  ./include/linux/sctp.h:611:32: warning: nested flexible array
  ./include/linux/sctp.h:628:33: warning: nested flexible array

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2023-04-19 11:16:29 -04:00 committed by David S. Miller
parent add7370a39
commit 73175a0429
3 changed files with 6 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
include/linux/sctp.h
View file

@ -603,7 +603,7 @@ struct sctp_fwdtsn_skip {
struct sctp_fwdtsn_hdr { struct sctp_fwdtsn_hdr {
__be32 new_cum_tsn; __be32 new_cum_tsn;
struct sctp_fwdtsn_skip skip[]; /* struct sctp_fwdtsn_skip skip[]; */
}; };
struct sctp_fwdtsn_chunk { struct sctp_fwdtsn_chunk {
@ -620,7 +620,7 @@ struct sctp_ifwdtsn_skip {
struct sctp_ifwdtsn_hdr { struct sctp_ifwdtsn_hdr {
__be32 new_cum_tsn; __be32 new_cum_tsn;
struct sctp_ifwdtsn_skip skip[]; /* struct sctp_ifwdtsn_skip skip[]; */
}; };
struct sctp_ifwdtsn_chunk { struct sctp_ifwdtsn_chunk {

4
include/net/sctp/sctp.h
View file

@ -452,8 +452,8 @@ for (err = (struct sctp_errhdr *)((void *)chunk_hdr + \
_sctp_walk_fwdtsn((pos), (chunk), ntohs((chunk)->chunk_hdr->length) - sizeof(struct sctp_fwdtsn_chunk)) _sctp_walk_fwdtsn((pos), (chunk), ntohs((chunk)->chunk_hdr->length) - sizeof(struct sctp_fwdtsn_chunk))
#define _sctp_walk_fwdtsn(pos, chunk, end)\ #define _sctp_walk_fwdtsn(pos, chunk, end)\
for (pos = chunk->subh.fwdtsn_hdr->skip;\ for (pos = (void *)(chunk->subh.fwdtsn_hdr + 1);\
(void *)pos <= (void *)chunk->subh.fwdtsn_hdr->skip + end - sizeof(struct sctp_fwdtsn_skip);\ (void *)pos <= (void *)(chunk->subh.fwdtsn_hdr + 1) + end - sizeof(struct sctp_fwdtsn_skip);\
pos++) pos++)
/* External references. */ /* External references. */

4
net/sctp/stream_interleave.c
View file

@ -1153,8 +1153,8 @@ static void sctp_generate_iftsn(struct sctp_outq *q, __u32 ctsn)
} }
#define _sctp_walk_ifwdtsn(pos, chunk, end) \ #define _sctp_walk_ifwdtsn(pos, chunk, end) \
for (pos = chunk->subh.ifwdtsn_hdr->skip; \ for (pos = (void *)(chunk->subh.ifwdtsn_hdr + 1); \
(void *)pos <= (void *)chunk->subh.ifwdtsn_hdr->skip + (end) - \ (void *)pos <= (void *)(chunk->subh.ifwdtsn_hdr + 1) + (end) - \
sizeof(struct sctp_ifwdtsn_skip); pos++) sizeof(struct sctp_ifwdtsn_skip); pos++)
#define sctp_walk_ifwdtsn(pos, ch) \ #define sctp_walk_ifwdtsn(pos, ch) \