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

!4050 kabi: net: reserve space for net 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JEE4MXSUSVRUEB7TQY6VERCOMCW4XR4G/ 
Reserve space for net, inheriting the kabi reservation in kernel 5.10.

Wang Hai (6):
  kabi: net: reserve space for net base subsystem related structure
  kabi: net: reserve space for net bpf subsystem related structure
  kabi: net: reserve space for net can subsystem related structure
  kabi: net: reserve space for net netfilter subsystem related structure
  kabi: net: reserve space for net rdma subsystem related structure
  kabi: net: reserve space for net sunrpc subsystem related structure


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I8OWRC 
 
Link:https://gitee.com/openeuler/kernel/pulls/4050

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 6e92c8c8 910043a7

include/linux/can/core.h

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/can.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <linux/kabi.h>



#define DNAME(dev) ((dev) ? (dev)->name : "any")
@@ -32,6 +33,9 @@ struct can_proto { 
	int protocol;

	const struct proto_ops *ops;

	struct proto *prot;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



/* required_size

include/linux/can/dev.h

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/can/skb.h>

#include <linux/ethtool.h>

#include <linux/netdevice.h>

#include <linux/kabi.h>



/*

 * CAN mode
@@ -85,6 +86,11 @@ struct can_priv { 
	int (*do_get_berr_counter)(const struct net_device *dev,

				   struct can_berr_counter *bec);

	int (*do_get_auto_tdcv)(const struct net_device *dev, u32 *tdcv);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



static inline bool can_tdc_is_enabled(const struct can_priv *priv)

include/linux/can/rx-offload.h

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/netdevice.h>

#include <linux/can.h>

#include <linux/kabi.h>



struct can_rx_offload {

	struct net_device *dev;
@@ -29,6 +30,9 @@ struct can_rx_offload { 
	struct napi_struct napi;



	bool inc;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



int can_rx_offload_add_timestamp(struct net_device *dev,

include/linux/device.h

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/device/class.h>

#include <linux/device/driver.h>

#include <linux/cleanup.h>

#include <linux/kabi.h>

#include <asm/device.h>



struct device;
@@ -805,6 +806,15 @@ struct device { 
#ifdef CONFIG_DMA_OPS_BYPASS

	bool			dma_ops_bypass : 1;

#endif



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

	KABI_RESERVE(8)

};



/**

include/linux/device/class.h

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/klist.h>

#include <linux/pm.h>

#include <linux/device/bus.h>

#include <linux/kabi.h>



struct device;

struct fwnode_handle;
@@ -69,6 +70,11 @@ struct class { 
	void (*get_ownership)(const struct device *dev, kuid_t *uid, kgid_t *gid);



	const struct dev_pm_ops *pm;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



struct class_dev_iter {