diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-03-02 11:16:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-02 11:16:35 -0800 |
| commit | 0b56a29f708e10d0ae81a6503cbe41edaaaefbc8 (patch) | |
| tree | 65e889ec4fb52ea6851856c7a6f18ae3b5ca6659 /include/net | |
| parent | Merge branch 'net-thunderx-Miscellaneous-changes' (diff) | |
| parent | tehuti: Replace zero-length array with flexible-array member (diff) | |
| download | wireguard-linux-0b56a29f708e10d0ae81a6503cbe41edaaaefbc8.tar.xz wireguard-linux-0b56a29f708e10d0ae81a6503cbe41edaaaefbc8.zip | |
Merge branch 'net-zl-array'
More zero-length array transformations from Gustavo A. R. Silva.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/inet_sock.h | 2 | ||||
| -rw-r--r-- | include/net/ip6_fib.h | 2 | ||||
| -rw-r--r-- | include/net/ip_fib.h | 4 | ||||
| -rw-r--r-- | include/net/mip6.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 34c4436fd18f..a7ce00af6c44 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -52,7 +52,7 @@ struct ip_options { unsigned char router_alert; unsigned char cipso; unsigned char __pad2; - unsigned char __data[0]; + unsigned char __data[]; }; struct ip_options_rcu { diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index fd60a8ac02ee..6ec26e4d7f11 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -198,7 +198,7 @@ struct fib6_info { struct rcu_head rcu; struct nexthop *nh; - struct fib6_nh fib6_nh[0]; + struct fib6_nh fib6_nh[]; }; struct rt6_info { diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 6a1ae49809de..dabe398bee4c 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -153,7 +153,7 @@ struct fib_info { bool nh_updated; struct nexthop *nh; struct rcu_head rcu; - struct fib_nh fib_nh[0]; + struct fib_nh fib_nh[]; }; @@ -250,7 +250,7 @@ struct fib_table { int tb_num_default; struct rcu_head rcu; unsigned long *tb_data; - unsigned long __data[0]; + unsigned long __data[]; }; struct fib_dump_filter { diff --git a/include/net/mip6.h b/include/net/mip6.h index f1c28971c362..67cd7e50804c 100644 --- a/include/net/mip6.h +++ b/include/net/mip6.h @@ -25,7 +25,7 @@ struct ip6_mh { __u8 ip6mh_reserved; __u16 ip6mh_cksum; /* Followed by type specific messages */ - __u8 data[0]; + __u8 data[]; } __packed; #define IP6_MH_TYPE_BRR 0 /* Binding Refresh Request */ |