From: Geliang Tang <tanggeliang@kylinos.cn>
get_addr() interfece will be invoked by dump_addr(), which using a const
parameter "info", so this patch change "info" parameter of get_addr() as
const too.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
net/mptcp/pm_netlink.c | 9 ++++++---
net/mptcp/pm_userspace.c | 2 +-
net/mptcp/protocol.h | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index ef47b54d8328..dc87f9ee9000 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1791,12 +1791,15 @@ int mptcp_nl_fill_addr(struct sk_buff *skb,
}
static int mptcp_pm_nl_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
- struct genl_info *info)
+ const struct genl_info *info)
{
- struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
+ struct net *net = genl_info_net(info);
struct mptcp_pm_addr_entry *entry;
+ struct pm_nl_pernet *pernet;
int ret = -EINVAL;
+ pernet = pm_nl_get_pernet(net);
+
spin_lock_bh(&pernet->lock);
entry = __lookup_addr_by_id(pernet, id);
if (entry) {
@@ -1809,7 +1812,7 @@ static int mptcp_pm_nl_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
}
static int mptcp_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
- struct genl_info *info)
+ const struct genl_info *info)
{
if (info->attrs[MPTCP_PM_ATTR_TOKEN])
return mptcp_userspace_pm_get_addr(id, addr, info);
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index 7c0bb084303b..95c7cb56e9b4 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -669,7 +669,7 @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
}
int mptcp_userspace_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
- struct genl_info *info)
+ const struct genl_info *info)
{
struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];
struct net *net = genl_info_net(info);
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 4342be369914..be2028ffebde 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -1128,7 +1128,7 @@ bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info
int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
struct netlink_callback *cb);
int mptcp_userspace_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
- struct genl_info *info);
+ const struct genl_info *info);
static inline u8 subflow_get_local_id(const struct mptcp_subflow_context *subflow)
{
--
2.43.0