Skip to content

K
Kernel

openeuler / Kernel
大约 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 90d93088 编写于 作者: P Paolo Abeni 提交者： Jakub Kicinski
浏览文件
操作

mptcp: constify a bunch of of helpers 

A few pm-related helpers don't touch arguments which lacking
the const modifier, let's constify them.
Signed-off-by: NPaolo Abeni <pabeni@redhat.com>
Signed-off-by: NMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: NJakub Kicinski <kuba@kernel.org>
上级 af7939f3
隐藏空白更改
内联 并排
Showing with 32 addition and 32 deletion
net/mptcp/pm.c
浏览文件 @ 90d93088
...@@ -219,7 +219,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, ...@@ -219,7 +219,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
} }
void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,
struct mptcp_addr_info *addr) const struct mptcp_addr_info *addr)
{ {
struct mptcp_pm_data *pm = &msk->pm; struct mptcp_pm_data *pm = &msk->pm;
...@@ -275,7 +275,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq) ...@@ -275,7 +275,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)
/* path manager helpers */ /* path manager helpers */
bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb,
unsigned int opt_size, unsigned int remaining, unsigned int opt_size, unsigned int remaining,
struct mptcp_addr_info *addr, bool *echo, struct mptcp_addr_info *addr, bool *echo,
bool *drop_other_suboptions) bool *drop_other_suboptions)
......
net/mptcp/pm_netlink.c
浏览文件 @ 90d93088
...@@ -120,7 +120,7 @@ static void remote_address(const struct sock_common *skc, ...@@ -120,7 +120,7 @@ static void remote_address(const struct sock_common *skc,
} }
static bool lookup_subflow_by_saddr(const struct list_head *list, static bool lookup_subflow_by_saddr(const struct list_head *list,
struct mptcp_addr_info *saddr) const struct mptcp_addr_info *saddr)
{ {
struct mptcp_subflow_context *subflow; struct mptcp_subflow_context *subflow;
struct mptcp_addr_info cur; struct mptcp_addr_info cur;
...@@ -138,7 +138,7 @@ static bool lookup_subflow_by_saddr(const struct list_head *list, ...@@ -138,7 +138,7 @@ static bool lookup_subflow_by_saddr(const struct list_head *list,
} }
static bool lookup_subflow_by_daddr(const struct list_head *list, static bool lookup_subflow_by_daddr(const struct list_head *list,
struct mptcp_addr_info *daddr) const struct mptcp_addr_info *daddr)
{ {
struct mptcp_subflow_context *subflow; struct mptcp_subflow_context *subflow;
struct mptcp_addr_info cur; struct mptcp_addr_info cur;
...@@ -157,10 +157,10 @@ static bool lookup_subflow_by_daddr(const struct list_head *list, ...@@ -157,10 +157,10 @@ static bool lookup_subflow_by_daddr(const struct list_head *list,
static struct mptcp_pm_addr_entry * static struct mptcp_pm_addr_entry *
select_local_address(const struct pm_nl_pernet *pernet, select_local_address(const struct pm_nl_pernet *pernet,
struct mptcp_sock *msk) const struct mptcp_sock *msk)
{ {
const struct sock *sk = (const struct sock *)msk;
struct mptcp_pm_addr_entry *entry, *ret = NULL; struct mptcp_pm_addr_entry *entry, *ret = NULL;
struct sock *sk = (struct sock *)msk;
msk_owned_by_me(msk); msk_owned_by_me(msk);
...@@ -190,7 +190,7 @@ select_local_address(const struct pm_nl_pernet *pernet, ...@@ -190,7 +190,7 @@ select_local_address(const struct pm_nl_pernet *pernet,
} }
static struct mptcp_pm_addr_entry * static struct mptcp_pm_addr_entry *
select_signal_address(struct pm_nl_pernet *pernet, struct mptcp_sock *msk) select_signal_address(struct pm_nl_pernet *pernet, const struct mptcp_sock *msk)
{ {
struct mptcp_pm_addr_entry *entry, *ret = NULL; struct mptcp_pm_addr_entry *entry, *ret = NULL;
...@@ -214,16 +214,16 @@ select_signal_address(struct pm_nl_pernet *pernet, struct mptcp_sock *msk) ...@@ -214,16 +214,16 @@ select_signal_address(struct pm_nl_pernet *pernet, struct mptcp_sock *msk)
return ret; return ret;
} }
unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk) unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk)
{ {
struct pm_nl_pernet *pernet; const struct pm_nl_pernet *pernet;
pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id); pernet = net_generic(sock_net((const struct sock *)msk), pm_nl_pernet_id);
return READ_ONCE(pernet->add_addr_signal_max); return READ_ONCE(pernet->add_addr_signal_max);
} }
EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_signal_max); EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_signal_max);
unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk) unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk)
{ {
struct pm_nl_pernet *pernet; struct pm_nl_pernet *pernet;
...@@ -232,7 +232,7 @@ unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk) ...@@ -232,7 +232,7 @@ unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk)
} }
EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_accept_max); EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_accept_max);
unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk) unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk)
{ {
struct pm_nl_pernet *pernet; struct pm_nl_pernet *pernet;
...@@ -241,7 +241,7 @@ unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk) ...@@ -241,7 +241,7 @@ unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk)
} }
EXPORT_SYMBOL_GPL(mptcp_pm_get_subflows_max); EXPORT_SYMBOL_GPL(mptcp_pm_get_subflows_max);
unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk) unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk)
{ {
struct pm_nl_pernet *pernet; struct pm_nl_pernet *pernet;
...@@ -264,8 +264,8 @@ bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk) ...@@ -264,8 +264,8 @@ bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk)
} }
struct mptcp_pm_add_entry * struct mptcp_pm_add_entry *
mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk, mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk,
struct mptcp_addr_info *addr) const struct mptcp_addr_info *addr)
{ {
struct mptcp_pm_add_entry *entry; struct mptcp_pm_add_entry *entry;
...@@ -346,7 +346,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) ...@@ -346,7 +346,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
struct mptcp_pm_add_entry * struct mptcp_pm_add_entry *
mptcp_pm_del_add_timer(struct mptcp_sock *msk, mptcp_pm_del_add_timer(struct mptcp_sock *msk,
struct mptcp_addr_info *addr, bool check_id) const struct mptcp_addr_info *addr, bool check_id)
{ {
struct mptcp_pm_add_entry *entry; struct mptcp_pm_add_entry *entry;
struct sock *sk = (struct sock *)msk; struct sock *sk = (struct sock *)msk;
...@@ -364,7 +364,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, ...@@ -364,7 +364,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,
} }
static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
struct mptcp_pm_addr_entry *entry) const struct mptcp_pm_addr_entry *entry)
{ {
struct mptcp_pm_add_entry *add_entry = NULL; struct mptcp_pm_add_entry *add_entry = NULL;
struct sock *sk = (struct sock *)msk; struct sock *sk = (struct sock *)msk;
...@@ -410,8 +410,8 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk) ...@@ -410,8 +410,8 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk)
} }
} }
static bool lookup_address_in_vec(struct mptcp_addr_info *addrs, unsigned int nr, static bool lookup_address_in_vec(const struct mptcp_addr_info *addrs, unsigned int nr,
struct mptcp_addr_info *addr) const struct mptcp_addr_info *addr)
{ {
int i; int i;
...@@ -493,9 +493,9 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info, ...@@ -493,9 +493,9 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info,
} }
static int static int
lookup_id_by_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *addr) lookup_id_by_addr(const struct pm_nl_pernet *pernet, const struct mptcp_addr_info *addr)
{ {
struct mptcp_pm_addr_entry *entry; const struct mptcp_pm_addr_entry *entry;
int ret = -1; int ret = -1;
rcu_read_lock(); rcu_read_lock();
...@@ -1281,7 +1281,7 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id, ...@@ -1281,7 +1281,7 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,
} }
static bool remove_anno_list_by_saddr(struct mptcp_sock *msk, static bool remove_anno_list_by_saddr(struct mptcp_sock *msk,
struct mptcp_addr_info *addr) const struct mptcp_addr_info *addr)
{ {
struct mptcp_pm_add_entry *entry; struct mptcp_pm_add_entry *entry;
...@@ -1296,7 +1296,7 @@ static bool remove_anno_list_by_saddr(struct mptcp_sock *msk, ...@@ -1296,7 +1296,7 @@ static bool remove_anno_list_by_saddr(struct mptcp_sock *msk,
} }
static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk, static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk,
struct mptcp_addr_info *addr, const struct mptcp_addr_info *addr,
bool force) bool force)
{ {
struct mptcp_rm_list list = { .nr = 0 }; struct mptcp_rm_list list = { .nr = 0 };
......
net/mptcp/protocol.h
浏览文件 @ 90d93088
...@@ -742,7 +742,7 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk, ...@@ -742,7 +742,7 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,
void mptcp_pm_add_addr_received(struct mptcp_sock *msk, void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
const struct mptcp_addr_info *addr); const struct mptcp_addr_info *addr);
void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,
struct mptcp_addr_info *addr); const struct mptcp_addr_info *addr);
void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk); void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk);
void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk); void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk);
void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,
...@@ -753,10 +753,10 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk); ...@@ -753,10 +753,10 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk);
bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk); bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk);
struct mptcp_pm_add_entry * struct mptcp_pm_add_entry *
mptcp_pm_del_add_timer(struct mptcp_sock *msk, mptcp_pm_del_add_timer(struct mptcp_sock *msk,
struct mptcp_addr_info *addr, bool check_id); const struct mptcp_addr_info *addr, bool check_id);
struct mptcp_pm_add_entry * struct mptcp_pm_add_entry *
mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk, mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk,
struct mptcp_addr_info *addr); const struct mptcp_addr_info *addr);
int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id, int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,
u8 *flags, int *ifindex); u8 *flags, int *ifindex);
...@@ -815,7 +815,7 @@ static inline int mptcp_rm_addr_len(const struct mptcp_rm_list *rm_list) ...@@ -815,7 +815,7 @@ static inline int mptcp_rm_addr_len(const struct mptcp_rm_list *rm_list)
return TCPOLEN_MPTCP_RM_ADDR_BASE + roundup(rm_list->nr - 1, 4) + 1; return TCPOLEN_MPTCP_RM_ADDR_BASE + roundup(rm_list->nr - 1, 4) + 1;
} }
bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb,
unsigned int opt_size, unsigned int remaining, unsigned int opt_size, unsigned int remaining,
struct mptcp_addr_info *addr, bool *echo, struct mptcp_addr_info *addr, bool *echo,
bool *drop_other_suboptions); bool *drop_other_suboptions);
...@@ -829,10 +829,10 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk); ...@@ -829,10 +829,10 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk);
void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk,
const struct mptcp_rm_list *rm_list); const struct mptcp_rm_list *rm_list);
int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);
unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk); unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk);
unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk); unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk);
unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk); unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk);
unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk); unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk);
void mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk); void mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk);
void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk); void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或