diff mbox series

[v1,6/0006] Squash-to: "mptcp: allow dumping subflow context to userspace"

Message ID bd09b746907c90b322b5ae7bc296e99d366d0739.1583334095.git.pabeni@redhat.com
State Superseded, archived
Delegated to: Mat Martineau
Headers show
Series pm netlink: followup and fixes | expand

Commit Message

Paolo Abeni March 4, 2020, 3:02 p.m. UTC 
fix after field name change.

Additionally rename the exposed uAPI flags to be more consistent

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 include/uapi/linux/mptcp.h | 18 +++++++++---------
 net/mptcp/diag.c           |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index d087048fb4a2..c564140d20f0 100644
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -4,15 +4,15 @@ 
 
 #include <linux/types.h>
 
-#define MPTCP_SUBFLOW_FLAG_MCAP_REM	BIT(0)
-#define MPTCP_SUBFLOW_FLAG_MCAP_LOC	BIT(1)
-#define MPTCP_SUBFLOW_FLAG_JOIN_REM	BIT(2)
-#define MPTCP_SUBFLOW_FLAG_JOIN_LOC	BIT(3)
-#define MPTCP_SUBFLOW_FLAG_BKUP_REM	BIT(4)
-#define MPTCP_SUBFLOW_FLAG_BKUP_LOC	BIT(5)
-#define MPTCP_SUBFLOW_FLAG_4THACK	BIT(6)
-#define MPTCP_SUBFLOW_FLAG_CONNECTED	BIT(7)
-#define MPTCP_SUBFLOW_FLAG_MAPVALID	BIT(8)
+#define MPTCP_SUBFLOW_FLAG_MCAP_REM		BIT(0)
+#define MPTCP_SUBFLOW_FLAG_MCAP_LOC		BIT(1)
+#define MPTCP_SUBFLOW_FLAG_JOIN_REM		BIT(2)
+#define MPTCP_SUBFLOW_FLAG_JOIN_LOC		BIT(3)
+#define MPTCP_SUBFLOW_FLAG_BKUP_REM		BIT(4)
+#define MPTCP_SUBFLOW_FLAG_BKUP_LOC		BIT(5)
+#define MPTCP_SUBFLOW_FLAG_FULLY_ESTABLISHED	BIT(6)
+#define MPTCP_SUBFLOW_FLAG_CONNECTED		BIT(7)
+#define MPTCP_SUBFLOW_FLAG_MAPVALID		BIT(8)
 
 enum {
 	MPTCP_SUBFLOW_ATTR_UNSPEC,
diff --git a/net/mptcp/diag.c b/net/mptcp/diag.c
index 4b6d9f7e418f..a536586742f2 100644
--- a/net/mptcp/diag.c
+++ b/net/mptcp/diag.c
@@ -43,8 +43,8 @@  static int subflow_get_info(const struct sock *sk, struct sk_buff *skb)
 		flags |= MPTCP_SUBFLOW_FLAG_BKUP_REM;
 	if (sf->request_bkup)
 		flags |= MPTCP_SUBFLOW_FLAG_BKUP_LOC;
-	if (sf->fourth_ack)
-		flags |= MPTCP_SUBFLOW_FLAG_4THACK;
+	if (sf->fully_established)
+		flags |= MPTCP_SUBFLOW_FLAG_FULLY_ESTABLISHED;
 	if (sf->conn_finished)
 		flags |= MPTCP_SUBFLOW_FLAG_CONNECTED;
 	if (sf->map_valid)