hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8OWRC
----------------------------------------------------
Reserve some fields beforehand for net subsystem related structures prone to change.
Signed-off-by: Ziyang Xuan william.xuanziyang@huawei.com --- include/linux/ethtool.h | 6 ++++++ include/linux/phy.h | 12 ++++++++++++ include/linux/skbuff.h | 3 +++ include/net/tls.h | 3 +++ include/rdma/rdma_cm.h | 3 +++ 5 files changed, 27 insertions(+)
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index f9ee0a8c440b..9517aa2ae388 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -87,6 +87,9 @@ struct kernel_ethtool_ringparam { u32 cqe_size; u32 tx_push_buf_len; u32 tx_push_buf_max_len; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
/** @@ -977,6 +980,9 @@ struct ethtool_phy_ops { int (*start_cable_test_tdr)(struct phy_device *phydev, struct netlink_ext_ack *extack, const struct phy_tdr_config *config); + + KABI_RESERVE(1) + KABI_RESERVE(2) };
/** diff --git a/include/linux/phy.h b/include/linux/phy.h index 1351b802ffcf..5c077c776985 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -433,6 +433,9 @@ struct mii_bus {
/** @shared: shared state across different PHYs */ struct phy_package_shared *shared[PHY_MAX_ADDR]; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define to_mii_bus(d) container_of(d, struct mii_bus, dev)
@@ -761,6 +764,11 @@ struct phy_device { /* MACsec management functions */ const struct macsec_ops *macsec_ops; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
/* Generic phy_device::dev_flags */ @@ -1142,6 +1150,10 @@ struct phy_driver { int (*led_hw_control_get)(struct phy_device *dev, u8 index, unsigned long *rules);
+ KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; #define to_phy_driver(d) container_of(to_mdio_common_driver(d), \ struct phy_driver, mdiodrv) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 58c227b47d81..185777f34f99 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -331,6 +331,9 @@ struct tc_skb_ext { u8 post_ct_dnat:1; u8 act_miss:1; /* Set if act_miss_cookie is used */ u8 l2_miss:1; /* Set by bridge upon FDB or MDB miss */ + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #endif
diff --git a/include/net/tls.h b/include/net/tls.h index 4fa58e4afae5..26cb26e1daea 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -120,6 +120,9 @@ struct tls_strparser {
struct sk_buff *anchor; struct work_struct work; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
struct tls_sw_context_rx { diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h index aab31385fdce..642906a0aaaf 100644 --- a/include/rdma/rdma_cm.h +++ b/include/rdma/rdma_cm.h @@ -64,6 +64,9 @@ struct rdma_route { * 2 - Both primary and alternate path are available */ int num_pri_alt_paths; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
struct rdma_conn_param {