提交 45ef1561 编写于 作者: Z Zhengchao Shao

net: fix kabi change in struct net_device_ops

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7NDRB
CVE: NA

----------------------------------------

The member variable ndo_xdp_get_xmit_slave is added to the struct
net_device_ops in commit 879af96f("net, core: Add support for XDP
redirection to slave device"). As a result, the kabi is changed. It is
need to use the reserved KABI_RESERVE to rectify the fault.
Signed-off-by: NZhengchao Shao <shaozhengchao@huawei.com>
上级 9c359445
...@@ -1522,8 +1522,6 @@ struct net_device_ops { ...@@ -1522,8 +1522,6 @@ struct net_device_ops {
int (*ndo_xdp_xmit)(struct net_device *dev, int n, int (*ndo_xdp_xmit)(struct net_device *dev, int n,
struct xdp_frame **xdp, struct xdp_frame **xdp,
u32 flags); u32 flags);
struct net_device * (*ndo_xdp_get_xmit_slave)(struct net_device *dev,
struct xdp_buff *xdp);
int (*ndo_xsk_wakeup)(struct net_device *dev, int (*ndo_xsk_wakeup)(struct net_device *dev,
u32 queue_id, u32 flags); u32 queue_id, u32 flags);
struct devlink_port * (*ndo_get_devlink_port)(struct net_device *dev); struct devlink_port * (*ndo_get_devlink_port)(struct net_device *dev);
...@@ -1531,7 +1529,8 @@ struct net_device_ops { ...@@ -1531,7 +1529,8 @@ struct net_device_ops {
struct ip_tunnel_parm *p, int cmd); struct ip_tunnel_parm *p, int cmd);
struct net_device * (*ndo_get_peer_dev)(struct net_device *dev); struct net_device * (*ndo_get_peer_dev)(struct net_device *dev);
KABI_RESERVE(1) KABI_USE(1, struct net_device *(*ndo_xdp_get_xmit_slave)(struct net_device *dev,
struct xdp_buff *xdp))
KABI_RESERVE(2) KABI_RESERVE(2)
KABI_RESERVE(3) KABI_RESERVE(3)
KABI_RESERVE(4) KABI_RESERVE(4)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册