Skip to content

Commit

Permalink
mptcp: add struct mptcp_pm_add_entry
Browse files Browse the repository at this point in the history
Add a new struct mptcp_pm_add_entry to describe add_addr's entry.

Acked-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>
  • Loading branch information
Geliang Tang authored and David S. Miller committed Sep 25, 2020
1 parent dd72b0f commit 0abd40f
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions net/mptcp/pm_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ struct mptcp_pm_addr_entry {
struct rcu_head rcu;
};

struct mptcp_pm_add_entry {
struct list_head list;
struct mptcp_addr_info addr;
};

struct pm_nl_pernet {
/* protects pernet updates */
spinlock_t lock;
Expand Down Expand Up @@ -181,7 +186,7 @@ static void check_work_pending(struct mptcp_sock *msk)
static bool lookup_anno_list_by_saddr(struct mptcp_sock *msk,
struct mptcp_addr_info *addr)
{
struct mptcp_pm_addr_entry *entry;
struct mptcp_pm_add_entry *entry;

list_for_each_entry(entry, &msk->pm.anno_list, list) {
if (addresses_equal(&entry->addr, addr, false))
Expand All @@ -194,23 +199,23 @@ static bool lookup_anno_list_by_saddr(struct mptcp_sock *msk,
static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
struct mptcp_pm_addr_entry *entry)
{
struct mptcp_pm_addr_entry *clone = NULL;
struct mptcp_pm_add_entry *add_entry = NULL;

if (lookup_anno_list_by_saddr(msk, &entry->addr))
return false;

clone = kmemdup(entry, sizeof(*entry), GFP_ATOMIC);
if (!clone)
add_entry = kmalloc(sizeof(*add_entry), GFP_ATOMIC);
if (!add_entry)
return false;

list_add(&clone->list, &msk->pm.anno_list);
list_add(&add_entry->list, &msk->pm.anno_list);

return true;
}

void mptcp_pm_free_anno_list(struct mptcp_sock *msk)
{
struct mptcp_pm_addr_entry *entry, *tmp;
struct mptcp_pm_add_entry *entry, *tmp;

pr_debug("msk=%p", msk);

Expand Down Expand Up @@ -654,7 +659,7 @@ __lookup_addr_by_id(struct pm_nl_pernet *pernet, unsigned int id)
static bool remove_anno_list_by_saddr(struct mptcp_sock *msk,
struct mptcp_addr_info *addr)
{
struct mptcp_pm_addr_entry *entry, *tmp;
struct mptcp_pm_add_entry *entry, *tmp;

list_for_each_entry_safe(entry, tmp, &msk->pm.anno_list, list) {
if (addresses_equal(&entry->addr, addr, false)) {
Expand Down

0 comments on commit 0abd40f

Please sign in to comment.