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

Move the conflicting declaration to the end of the corresponding
structure. Notice that `struct ip_tunnel_info` is a flexible
structure, this is a structure that contains a flexible-array
member.

Fix the following warning:

drivers/net/geneve.c:56:33: 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 <[email protected]>
---
 drivers/net/geneve.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 54384f9b3872..77b0c3d52041 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -53,7 +53,6 @@ struct geneve_dev_node {
 };
 
 struct geneve_config {
-       struct ip_tunnel_info   info;
        bool                    collect_md;
        bool                    use_udp6_rx_checksums;
        bool                    ttl_inherit;
@@ -61,6 +60,9 @@ struct geneve_config {
        bool                    inner_proto_inherit;
        u16                     port_min;
        u16                     port_max;
+
+       /* Must be last --ends in a flexible-array member. */
+       struct ip_tunnel_info   info;
 };
 
 /* Pseudo network device */
-- 
2.43.0


Reply via email to