Skip to content

Commit 647cfa6

Browse files
Geliang Tangintel-lab-lkp
authored andcommitted
mptcp: add mptcp_for_each_userspace_pm_addr macro
Similar to mptcp_for_each_subflow() macro, this patch adds a new macro mptcp_for_each_userspace_pm_addr() for userspace PM to iterate over the address entries on the local address list userspace_pm_local_addr_list of the mptcp socket. This patch doesn't change the behaviour of the code, just refactoring. Signed-off-by: Geliang Tang <[email protected]>
1 parent e1476d0 commit 647cfa6

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

net/mptcp/pm_userspace.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
#include "mib.h"
99
#include "mptcp_pm_gen.h"
1010

11+
#define mptcp_for_each_userspace_pm_addr(__msk, __entry) \
12+
list_for_each_entry(__entry, &((__msk)->pm.userspace_pm_local_addr_list), list)
13+
1114
void mptcp_free_local_addr_list(struct mptcp_sock *msk)
1215
{
1316
struct mptcp_pm_addr_entry *entry, *tmp;
@@ -32,7 +35,7 @@ mptcp_userspace_pm_lookup_addr(struct mptcp_sock *msk,
3235
{
3336
struct mptcp_pm_addr_entry *entry;
3437

35-
list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {
38+
mptcp_for_each_userspace_pm_addr(msk, entry) {
3639
if (mptcp_addresses_equal(&entry->addr, addr, false))
3740
return entry;
3841
}
@@ -54,7 +57,7 @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
5457
bitmap_zero(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
5558

5659
spin_lock_bh(&msk->pm.lock);
57-
list_for_each_entry(e, &msk->pm.userspace_pm_local_addr_list, list) {
60+
mptcp_for_each_userspace_pm_addr(msk, e) {
5861
addr_match = mptcp_addresses_equal(&e->addr, &entry->addr, true);
5962
if (addr_match && entry->addr.id == 0 && needs_id)
6063
entry->addr.id = e->addr.id;
@@ -124,7 +127,7 @@ mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *msk, unsigned int id)
124127
{
125128
struct mptcp_pm_addr_entry *entry;
126129

127-
list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {
130+
mptcp_for_each_userspace_pm_addr(msk, entry) {
128131
if (entry->addr.id == id)
129132
return entry;
130133
}
@@ -659,7 +662,7 @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
659662

660663
lock_sock(sk);
661664
spin_lock_bh(&msk->pm.lock);
662-
list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {
665+
mptcp_for_each_userspace_pm_addr(msk, entry) {
663666
if (test_bit(entry->addr.id, bitmap->map))
664667
continue;
665668

0 commit comments

Comments
 (0)