Unverified Commit b97e28ba authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4351 kabi: net: reserve space for net subsystem related structure 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ziyang Xuan <william.xuanziyang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LNEO3B7X3ORPXSHJXILDWJLO6N3D3LJ7/ 
 
https://gitee.com/openeuler/kernel/issues/I8OWRC 
 
Link:https://gitee.com/openeuler/kernel/pulls/4351

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 5aa66c95 432563bf

include/linux/ethtool.h

+6 −0
Original line number Diff line number Diff line
@@ -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)

};



/**

include/linux/phy.h

+12 −0
Original line number Diff line number Diff line
@@ -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)

include/linux/skbuff.h

+3 −0
Original line number Diff line number Diff line
@@ -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

include/net/tls.h

+3 −0
Original line number Diff line number Diff line
@@ -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 {

include/rdma/rdma_cm.h

+3 −0
Original line number Diff line number Diff line
@@ -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 {