From nobody Fri May 3 21:16:16 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp42173pid; Fri, 15 Apr 2022 03:46:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+/xEnhl5H6BnJ1syWer81b3PtQBlFlP/WrrXmDhezxUDfX6W5QuVdg+A2YqbT7iFJJcAx X-Received: by 2002:aa7:c40b:0:b0:41d:9886:90a0 with SMTP id j11-20020aa7c40b000000b0041d988690a0mr7431618edq.275.1650019589846; Fri, 15 Apr 2022 03:46:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650019589; cv=none; d=google.com; s=arc-20160816; b=UEcww8/+mIQoz5jJE2xkrK6iVT0/9cg+5PhnjWtBH1jZFYru7O7Dm4KQLyVCXfiJgz UGN+a4tlEokNWKozRf5cHCiFlgh1RSpYR9XTU3eHSnhcm+OhIHBz/O7Z3lY3h6RcnQVI Ekeq28YhAjuUNd3Ip3HAu1l9IdY5jK3oOZrW29S2JsniilUkfMzUdfUZeOT0XD48rTCg HdcGtm+rWyJLmjb5hIDxnToqQ+14O/PuRoirsa/obH1zQDMh+bY3qZQ4ojZMFkX8vixf XU+uXtv1xfwsQEMAK22yfLr6k4Kv2LsPmTI1cVZX3rZ8Rhuj/CORUG0YFqgA9TklbxOL eZHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=f6EwJIv5WdinK7ANFVBXH7fW4eXLa6wK1WP6i/QNT3g=; b=vrXx1CUrLOWkjwS9qZ2rGDiPtdbJYkDPyqv6nsB7GNo79R5Lt+lh7Z747m/HNcr1un nrVbTB1mo1jVWph+v1K1Doo1h6Ky7OChmNsB1nC4O7pZbAfK/WdYtId8reltuLgy+MOP zRIjRTgN36U/u+Jb3e1/3gR3xQfmyMZqHpzEzmkREJAK37O7cBdgGkwLAL8Bi5CGiQ9m lhRnmYyjA7w/tNQPAvGrZX+o/7aA35kEgTcm22N4mb9IbK3bgu1EHamLP1jrzx+QqJpr oG8unjMZsAONl4/nJlJFQn8mH3OByQM5U1LI4EjSHCOpJp/MQWpcUOUOW6W6wYsAphyE iJrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=4VWZEV0g; spf=pass (google.com: domain of mptcp+bounces-4750-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4750-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id n23-20020a170906725700b006e860362818si774698ejk.41.2022.04.15.03.46.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Apr 2022 03:46:29 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4750-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares-net.20210112.gappssmtp.com header.s=20210112 header.b=4VWZEV0g; spf=pass (google.com: domain of mptcp+bounces-4750-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4750-wpasupplicant.patchew=gmail.com@lists.linux.dev" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id E000E1C0F13 for ; Fri, 15 Apr 2022 10:46:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A99DD2F50; Fri, 15 Apr 2022 10:46:26 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2ABC3184 for ; Fri, 15 Apr 2022 10:46:23 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id e21so10223576wrc.8 for ; Fri, 15 Apr 2022 03:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=f6EwJIv5WdinK7ANFVBXH7fW4eXLa6wK1WP6i/QNT3g=; b=4VWZEV0gI0sJXU6TpOSemNrCWjGj8HHcf9SrgNmIn+j4orKFBzgcsU2oND+oX+uUA6 8JvQEx/qTUHxNSv2jdAeca9Cuvs9wV2Cs17dHLUw5dJ0siv7KU0S9oBvWNqzl+qHpbP3 2GxKZu2Z9Ot6ntCUE42EMdCT2XntZPHJkh5ipm/n4l+PBMEoXsC4Xx1anJGDLrrq69IH DfZZ7WdMzgZCT4LmLKmhTh1/OlFQL0NdaWAORt2zY3XExhLTrB7c8gCQQc5a91q7mNFF 6D0b6FhmyWD1IBG1fWp2n2qFovdvYY7VxVuoj4DKHOyhCIFW2DLgtrQALP6PmRQQJVvW 8QOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=f6EwJIv5WdinK7ANFVBXH7fW4eXLa6wK1WP6i/QNT3g=; b=gfnytNJsgDAcTeyH5xY/rCjasXK/QXZZt9cbWSqKMIqN48dqZJNWqK0Ve1u0iUHESN TnZGx8I9BTAkxe0uAwmVBU+KXcreDWLVD2TDYvkLZ5/3c7ffASQZbMqQgOc4XrGHQXyT 2fVSUYZS7+JJDZU1qeiQzQvS+II+hzi7sj5y8V5KLL9x78Hxm6HZsKm0j5cnVOCyGQAx VJFKgfpC4dpaZ2NWYfVPwBQcfhnLumTQeltl6ZToARXzJpCB7X1tCR7lMo0PI0Q7ZzWL 8XCm8mvSMgQu6liRO5rSLkL4+YH8i1hb0MO5wRRMqZz4UZ6Me8MIKuOAoFuQmoiatG3k xILw== X-Gm-Message-State: AOAM531NzjSzJiEdtr6JDxGJUfjSlOdpeKscLjqtPe6RPOK2WUCvv4JK /WGRO5VRGe4WmJSEPxNaOjlE4xOmtVceTOHi X-Received: by 2002:adf:fb0b:0:b0:205:dfbd:8601 with SMTP id c11-20020adffb0b000000b00205dfbd8601mr4934871wrr.527.1650019581837; Fri, 15 Apr 2022 03:46:21 -0700 (PDT) Received: from tsr-vdi-mbaerts.nix.tessares.net (static.23.216.130.94.clients.your-server.de. [94.130.216.23]) by smtp.gmail.com with ESMTPSA id l41-20020a05600c1d2900b0038ec7fcb979sm8704329wms.26.2022.04.15.03.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 03:46:21 -0700 (PDT) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next] Squash to "mptcp: handle local addrs announced by userspace PMs" Date: Fri, 15 Apr 2022 12:45:50 +0200 Message-Id: <20220415104550.1037339-1-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move mptcp_pm_addr_entry structure to protocol.h as this commit exports a new function having a parameter using this structure. This was causing the CI to complain about this commit (and the 2 next ones). Fixing it here instead of modifying the CI not to complain about that. Note: compared to what Kishen did in commit "mptcp: netlink: Add MPTCP_PM_CMD_ANNOUNCE", I moved the new structure with other mptcp_pm ones. Signed-off-by: Matthieu Baerts --- Notes: to be squashed in "mptcp: handle local addrs announced by userspace PMs" net/mptcp/pm_netlink.c | 8 -------- net/mptcp/protocol.h | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 92d47e8e8983..9d515c3e0b16 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -22,14 +22,6 @@ static struct genl_family mptcp_genl_family; =20 static int pm_nl_pernet_id; =20 -struct mptcp_pm_addr_entry { - struct list_head list; - struct mptcp_addr_info addr; - u8 flags; - int ifindex; - struct socket *lsk; -}; - struct mptcp_pm_add_entry { struct list_head list; struct mptcp_addr_info addr; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 40dabf9462a8..f41089e54555 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -229,6 +229,14 @@ struct mptcp_pm_data { struct mptcp_rm_list rm_list_rx; }; =20 +struct mptcp_pm_addr_entry { + struct list_head list; + struct mptcp_addr_info addr; + u8 flags; + int ifindex; + struct socket *lsk; +}; + struct mptcp_data_frag { struct list_head list; u64 data_seq; --=20 2.34.1