From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org
Cc: Geliang Tang <geliang.tang@suse.com>,
davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com,
edumazet@google.com, matthieu.baerts@tessares.net,
mptcp@lists.linux.dev,
Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net-next 1/6] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h
Date: Fri, 8 Jul 2022 10:14:08 -0700 [thread overview]
Message-ID: <20220708171413.327112-2-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20220708171413.327112-1-mathew.j.martineau@linux.intel.com>
From: Geliang Tang <geliang.tang@suse.com>
Move macro MPTCPOPT_HMAC_LEN definition from net/mptcp/protocol.h to
include/net/mptcp.h.
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
include/net/mptcp.h | 3 ++-
net/mptcp/protocol.h | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index 4d761ad530c9..ac9cf7271d46 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -39,6 +39,7 @@ struct mptcp_ext {
infinite_map:1;
};
+#define MPTCPOPT_HMAC_LEN 20
#define MPTCP_RM_IDS_MAX 8
struct mptcp_rm_list {
@@ -89,7 +90,7 @@ struct mptcp_out_options {
u32 nonce;
u32 token;
u64 thmac;
- u8 hmac[20];
+ u8 hmac[MPTCPOPT_HMAC_LEN];
};
};
#endif
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 480c5320b86e..07871e10e510 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -83,7 +83,6 @@
/* MPTCP MP_JOIN flags */
#define MPTCPOPT_BACKUP BIT(0)
-#define MPTCPOPT_HMAC_LEN 20
#define MPTCPOPT_THMAC_LEN 8
/* MPTCP MP_CAPABLE flags */
--
2.37.0
next prev parent reply other threads:[~2022-07-08 17:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-08 17:14 [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak Mat Martineau
2022-07-08 17:14 ` Mat Martineau [this message]
2022-07-08 17:14 ` [PATCH net-next 2/6] selftests: mptcp: tweak simult_flows for debug kernels Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 3/6] selftests: mptcp: userspace pm address tests Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 4/6] selftests: mptcp: userspace pm subflow tests Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 5/6] selftests: mptcp: avoid Terminated messages in userspace_pm Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 6/6] selftests: mptcp: update pm_nl_ctl usage header Mat Martineau
2022-07-09 11:40 ` [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220708171413.327112-2-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=geliang.tang@suse.com \
--cc=kuba@kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.