Skip to content

Commit f643b80

Browse files
geliangtangdavem330
authored andcommitted
mptcp: rename addr_signal and the related functions
This patch renamed addr_signal and the related functions with the explicit word "add". Suggested-by: Matthieu Baerts <matthieu.baerts@tessares.net> Suggested-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Geliang Tang <geliangtang@gmail.com> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 075c156 commit f643b80

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

net/mptcp/options.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -571,18 +571,18 @@ static u64 add_addr6_generate_hmac(u64 key1, u64 key2, u8 addr_id,
571571
}
572572
#endif
573573

574-
static bool mptcp_established_options_addr(struct sock *sk,
575-
unsigned int *size,
576-
unsigned int remaining,
577-
struct mptcp_out_options *opts)
574+
static bool mptcp_established_options_add_addr(struct sock *sk,
575+
unsigned int *size,
576+
unsigned int remaining,
577+
struct mptcp_out_options *opts)
578578
{
579579
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
580580
struct mptcp_sock *msk = mptcp_sk(subflow->conn);
581581
struct mptcp_addr_info saddr;
582582
int len;
583583

584-
if (!mptcp_pm_should_signal(msk) ||
585-
!(mptcp_pm_addr_signal(msk, remaining, &saddr)))
584+
if (!mptcp_pm_should_add_signal(msk) ||
585+
!(mptcp_pm_add_addr_signal(msk, remaining, &saddr)))
586586
return false;
587587

588588
len = mptcp_add_addr_len(saddr.family);
@@ -640,7 +640,7 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,
640640

641641
*size += opt_size;
642642
remaining -= opt_size;
643-
if (mptcp_established_options_addr(sk, &opt_size, remaining, opts)) {
643+
if (mptcp_established_options_add_addr(sk, &opt_size, remaining, opts)) {
644644
*size += opt_size;
645645
remaining -= opt_size;
646646
ret = true;

net/mptcp/pm.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,
1818
pr_debug("msk=%p, local_id=%d", msk, addr->id);
1919

2020
msk->pm.local = *addr;
21-
WRITE_ONCE(msk->pm.addr_signal, true);
21+
WRITE_ONCE(msk->pm.add_addr_signal, true);
2222
return 0;
2323
}
2424

@@ -151,22 +151,22 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
151151

152152
/* path manager helpers */
153153

154-
bool mptcp_pm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
155-
struct mptcp_addr_info *saddr)
154+
bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
155+
struct mptcp_addr_info *saddr)
156156
{
157157
int ret = false;
158158

159159
spin_lock_bh(&msk->pm.lock);
160160

161161
/* double check after the lock is acquired */
162-
if (!mptcp_pm_should_signal(msk))
162+
if (!mptcp_pm_should_add_signal(msk))
163163
goto out_unlock;
164164

165165
if (remaining < mptcp_add_addr_len(msk->pm.local.family))
166166
goto out_unlock;
167167

168168
*saddr = msk->pm.local;
169-
WRITE_ONCE(msk->pm.addr_signal, false);
169+
WRITE_ONCE(msk->pm.add_addr_signal, false);
170170
ret = true;
171171

172172
out_unlock:
@@ -186,7 +186,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk)
186186
msk->pm.local_addr_used = 0;
187187
msk->pm.subflows = 0;
188188
WRITE_ONCE(msk->pm.work_pending, false);
189-
WRITE_ONCE(msk->pm.addr_signal, false);
189+
WRITE_ONCE(msk->pm.add_addr_signal, false);
190190
WRITE_ONCE(msk->pm.accept_addr, false);
191191
WRITE_ONCE(msk->pm.accept_subflow, false);
192192
msk->pm.status = 0;

net/mptcp/protocol.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ struct mptcp_pm_data {
162162

163163
spinlock_t lock; /*protects the whole PM data */
164164

165-
bool addr_signal;
165+
bool add_addr_signal;
166166
bool server_side;
167167
bool work_pending;
168168
bool accept_addr;
@@ -438,9 +438,9 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,
438438
int mptcp_pm_remove_addr(struct mptcp_sock *msk, u8 local_id);
439439
int mptcp_pm_remove_subflow(struct mptcp_sock *msk, u8 remote_id);
440440

441-
static inline bool mptcp_pm_should_signal(struct mptcp_sock *msk)
441+
static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk)
442442
{
443-
return READ_ONCE(msk->pm.addr_signal);
443+
return READ_ONCE(msk->pm.add_addr_signal);
444444
}
445445

446446
static inline unsigned int mptcp_add_addr_len(int family)
@@ -450,8 +450,8 @@ static inline unsigned int mptcp_add_addr_len(int family)
450450
return TCPOLEN_MPTCP_ADD_ADDR6;
451451
}
452452

453-
bool mptcp_pm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
454-
struct mptcp_addr_info *saddr);
453+
bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
454+
struct mptcp_addr_info *saddr);
455455
int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);
456456

457457
void __init mptcp_pm_nl_init(void);

0 commit comments

Comments
 (0)