diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 75d7de34c90874cea69471f93a47df669b0e30f0..4111d53f46569ceba9fd2030110a35163fcc45fa 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -8,6 +8,7 @@ #include #include #include +#include struct net; @@ -88,6 +89,10 @@ struct netlink_ext_ack { u8 cookie[NETLINK_MAX_COOKIE_LEN]; u8 cookie_len; char _msg_buf[NETLINK_MAX_FMTMSG_LEN]; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; /* Always use this macro, this allows later putting the diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h index f79ce133e51a7cf12e5a12e1dc598c35cb6cb542..61aabd82b7898268492502256c390533b5a4edba 100644 --- a/include/net/cfg802154.h +++ b/include/net/cfg802154.h @@ -16,6 +16,8 @@ #include +#include + struct wpan_phy; struct wpan_phy_cca; struct cfg802154_scan_request; @@ -242,6 +244,9 @@ struct wpan_phy { */ enum ieee802154_filtering_level filtering; + KABI_RESERVE(1) + KABI_RESERVE(2) + char priv[] __aligned(NETDEV_ALIGN); }; diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h index 153960663ce4c2389259e0dc2bb4ba0b011dc698..7d9354c3c2edd934972610bfb62571c6745d13e9 100644 --- a/include/net/inet_frag.h +++ b/include/net/inet_frag.h @@ -8,6 +8,7 @@ #include #include #include +#include /* Per netns frag queues directory */ struct fqdir { @@ -102,6 +103,9 @@ struct inet_frag_queue { u16 max_size; struct fqdir *fqdir; struct rcu_head rcu; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct inet_frags { diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 15de07d36540526fd4ede91f77af17eaf9ea1a45..7f3e0a92f857e56120f047d50029202ab063968e 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -22,6 +22,7 @@ #include #include #include +#include struct fib_config { u8 fc_dst_len; @@ -100,6 +101,9 @@ struct fib_nh_common { struct rtable __rcu * __percpu *nhc_pcpu_rth_output; struct rtable __rcu *nhc_rth_input; struct fnhe_hash_bucket __rcu *nhc_exceptions; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct fib_nh { @@ -157,6 +161,10 @@ struct fib_info { bool pfsrc_removed; struct nexthop *nh; struct rcu_head rcu; + + KABI_RESERVE(1) + KABI_RESERVE(2) + struct fib_nh fib_nh[]; }; diff --git a/include/net/ipv6_stubs.h b/include/net/ipv6_stubs.h index c48186bf47372761493e9502da90dadcc0c26b01..c2f2cfbd1d036fe9249a330044cd22fbf47ece2f 100644 --- a/include/net/ipv6_stubs.h +++ b/include/net/ipv6_stubs.h @@ -9,6 +9,7 @@ #include #include #include +#include /* structs from net/ip6_fib.h */ struct fib6_info; @@ -69,6 +70,9 @@ struct ipv6_stub { int (*output)(struct net *, struct sock *, struct sk_buff *)); struct net_device *(*ipv6_dev_find)(struct net *net, const struct in6_addr *addr, struct net_device *dev); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; extern const struct ipv6_stub *ipv6_stub __read_mostly; diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h index 1f463b3957c78065708d87f4aec6d9d6e15c8b13..308c54643b3a9d05a12ede5242082b7e231f643c 100644 --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h @@ -14,6 +14,7 @@ #include #endif #include +#include struct ctl_table_header; struct nf_conntrack_ecache; @@ -31,6 +32,9 @@ struct nf_tcp_net { #if IS_ENABLED(CONFIG_NF_FLOW_TABLE) unsigned int offload_timeout; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; enum udp_conntrack { diff --git a/include/net/netns/core.h b/include/net/netns/core.h index a91ef9f8de60bb7c83086c97612bf4b0a8067a18..dfb54998c497e64d535859a36264d702ef186e75 100644 --- a/include/net/netns/core.h +++ b/include/net/netns/core.h @@ -3,6 +3,7 @@ #define __NETNS_CORE_H__ #include +#include struct ctl_table_header; struct prot_inuse; @@ -22,6 +23,11 @@ struct netns_core { #if IS_ENABLED(CONFIG_RPS) && IS_ENABLED(CONFIG_SYSCTL) struct cpumask *rps_default_mask; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; #endif diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 363c7d5105542ec7f43f91e5071b877314584bc5..9eff85ef369c0ed5efd4ee5aa88086488085fac3 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -32,6 +32,8 @@ #include #endif +#include + #define XFRM_PROTO_ESP 50 #define XFRM_PROTO_AH 51 #define XFRM_PROTO_COMP 108 @@ -289,6 +291,9 @@ struct xfrm_state { /* Private data of this transformer, format is opaque, * interpreted by xfrm_type methods. */ void *data; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; static inline struct net *xs_net(struct xfrm_state *x) @@ -549,6 +554,9 @@ struct xfrm_policy { struct rcu_head rcu; struct xfrm_dev_offload xdo; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; static inline struct net *xp_net(const struct xfrm_policy *xp)