sched: act_ct: avoid -Wflex-array-member-not-at-end warning
Subsystems (3)
PATCH v2 1/1 sched: act_ct: avoid -Wflex-array-member-not-at-end warning
-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]
---
Changes in v2:
- Remove flex array. (Jakub).
net/sched/act_ct.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/sched/act_ct.c +1 -3
@@ -44,8 +44,6 @@ static DEFINE_MUTEX(zones_mutex);struct zones_ht_key {struct net *net;u16 zone; -/* Note : pad[] must be the last field. */ -u8 pad[]; };struct tcf_ct_flow_table {
@@ -62,7 +60,7 @@ struct tcf_ct_flow_table {static const struct rhashtable_params zones_params = { .head_offset = offsetof(struct tcf_ct_flow_table , node), .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, };
Signature · 1 line
2.34.1
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Fri, 9 Aug 2024 09:22:12 -0600 you wrote:
-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][...]
Here is the summary with links:
- [v2,next] sched: act_ct: avoid -Wflex-array-member-not-at-end warning
https://git.kernel.org/netdev/net-next/c/e2d0fadd703c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html