mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sched: act_ct: avoid -Wflex-array-member-not-at-end warning

Browse Source 
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.

Remove unnecessary flex-array member `pad[]` and refactor the related
code a bit.

Fix the following warning:
net/sched/act_ct.c:57:29: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://patch.msgid.link/ZrY0JMVsImbDbx6r@cute
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Gustavo A. R. Silva 2024-08-09 09:22:12 -06:00 committed by Jakub Kicinski
parent e96f6fd30e
commit e2d0fadd70
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/sched/act_ct.c
View File

@ -44,8 +44,6 @@ static DEFINE_MUTEX(zones_mutex);
struct zones_ht_key { struct zones_ht_key {
struct net *net; struct net *net;
u16 zone; u16 zone;
/* Note : pad[] must be the last field. */
u8 pad[];
}; };
struct tcf_ct_flow_table { struct tcf_ct_flow_table {
@ -62,7 +60,7 @@ struct tcf_ct_flow_table {
static const struct rhashtable_params zones_params = { static const struct rhashtable_params zones_params = {
.head_offset = offsetof(struct tcf_ct_flow_table, node), .head_offset = offsetof(struct tcf_ct_flow_table, node),
.key_offset = offsetof(struct tcf_ct_flow_table, key), .key_offset = offsetof(struct tcf_ct_flow_table, key),
.key_len = offsetof(struct zones_ht_key, pad), .key_len = offsetofend(struct zones_ht_key, zone),
.automatic_shrinking = true, .automatic_shrinking = true,
}; };