mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index 4d761ad530c94350d646286fbe808d0cd9ef4095..ac9cf7271d46ac9f1343eeebabccc6f6002a8115 100644 (file)
--- 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 480c5320b86e52cd6e49c9b8d6d076094b8ebe3e..07871e10e510ed69c1283e24cb674c05ea5917b9 100644 (file)
--- 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 */