sys/linux: refine some l2cap flags

9 files changed, 89 insertions, 3 deletions

diff --git a/sys/linux/l2cap.txt b/sys/linux/l2cap.txt
index 17ca6f27d..c085a436c 100644
--- a/sys/linux/l2cap.txt
+++ b/sys/linux/l2cap.txt
@@ -69,7 +69,7 @@ l2cap_cmd_rej_unk {
 } [packed]
 
 l2cap_conf_rfc {
-	mode		int8
+	mode		flags[l2cap_rfc_mode, int8]
 	txwin_size	int8
 	max_transmit	int8
 	retrans_timeout	int16
@@ -77,15 +77,19 @@ l2cap_conf_rfc {
 	max_pdu_size	int16
 } [packed]
 
+l2cap_rfc_mode = L2CAP_MODE_BASIC, L2CAP_MODE_RETRANS, L2CAP_MODE_FLOWCTL, L2CAP_MODE_ERTM, L2CAP_MODE_STREAMING
+
 l2cap_conf_efs {
 	id		int8
-	stype		int8
+	stype		flags[l2cap_serv_type, int8]
 	msdu		int16
 	sdu_itime	int32
 	acc_lat		int32
 	flush_to	int32
 } [packed]
 
+l2cap_serv_type = L2CAP_SERV_NOTRAFIC, L2CAP_SERV_BESTEFFORT, L2CAP_SERV_GUARANTEED
+
 type l2cap_conf_opt[TYPE, VAL] {
 	type	const[TYPE, int8]
 	len	bytesize[val, int8]
@@ -97,10 +101,12 @@ l2cap_conf_opt_un [
 	l2cap_conf_efs		l2cap_conf_opt[L2CAP_CONF_EFS, l2cap_conf_efs]
 	l2cap_conf_mtu		l2cap_conf_opt[L2CAP_CONF_MTU, int16]
 	l2cap_conf_flushto	l2cap_conf_opt[L2CAP_CONF_FLUSH_TO, int16]
-	l2cap_conf_fcs		l2cap_conf_opt[L2CAP_CONF_FCS, int8]
+	l2cap_conf_fcs		l2cap_conf_opt[L2CAP_CONF_FCS, flags[l2cap_fcs_type, int8]]
 	l2cap_conf_ews		l2cap_conf_opt[L2CAP_CONF_EWS, int16]
 ] [varlen]
 
+l2cap_fcs_type = L2CAP_FCS_NONE, L2CAP_FCS_CRC16
+
 l2cap_conf_req {
 	dcid	int16
 	flags	int16
diff --git a/sys/linux/l2cap_386.const b/sys/linux/l2cap_386.const
index 63e7d5c9b..3aaee975c 100644
--- a/sys/linux/l2cap_386.const
+++ b/sys/linux/l2cap_386.const
@@ -22,12 +22,22 @@ L2CAP_ECRED_CONN_REQ = 23
 L2CAP_ECRED_CONN_RSP = 24
 L2CAP_ECRED_RECONF_REQ = 25
 L2CAP_ECRED_RECONF_RSP = 26
+L2CAP_FCS_CRC16 = 1
+L2CAP_FCS_NONE = 0
 L2CAP_INFO_REQ = 10
 L2CAP_INFO_RSP = 11
 L2CAP_LE_CONN_REQ = 20
 L2CAP_LE_CONN_RSP = 21
 L2CAP_LE_CREDITS = 22
+L2CAP_MODE_BASIC = 0
+L2CAP_MODE_ERTM = 3
+L2CAP_MODE_FLOWCTL = 2
+L2CAP_MODE_RETRANS = 1
+L2CAP_MODE_STREAMING = 4
 L2CAP_MOVE_CHAN_CFM = 16
 L2CAP_MOVE_CHAN_CFM_RSP = 17
 L2CAP_MOVE_CHAN_REQ = 14
 L2CAP_MOVE_CHAN_RSP = 15
+L2CAP_SERV_BESTEFFORT = 1
+L2CAP_SERV_GUARANTEED = 2
+L2CAP_SERV_NOTRAFIC = 0
diff --git a/sys/linux/l2cap_amd64.const b/sys/linux/l2cap_amd64.const
index 63e7d5c9b..3aaee975c 100644
--- a/sys/linux/l2cap_amd64.const
+++ b/sys/linux/l2cap_amd64.const
@@ -22,12 +22,22 @@ L2CAP_ECRED_CONN_REQ = 23
 L2CAP_ECRED_CONN_RSP = 24
 L2CAP_ECRED_RECONF_REQ = 25
 L2CAP_ECRED_RECONF_RSP = 26
+L2CAP_FCS_CRC16 = 1
+L2CAP_FCS_NONE = 0
 L2CAP_INFO_REQ = 10
 L2CAP_INFO_RSP = 11
 L2CAP_LE_CONN_REQ = 20
 L2CAP_LE_CONN_RSP = 21
 L2CAP_LE_CREDITS = 22
+L2CAP_MODE_BASIC = 0
+L2CAP_MODE_ERTM = 3
+L2CAP_MODE_FLOWCTL = 2
+L2CAP_MODE_RETRANS = 1
+L2CAP_MODE_STREAMING = 4
 L2CAP_MOVE_CHAN_CFM = 16
 L2CAP_MOVE_CHAN_CFM_RSP = 17
 L2CAP_MOVE_CHAN_REQ = 14
 L2CAP_MOVE_CHAN_RSP = 15
+L2CAP_SERV_BESTEFFORT = 1
+L2CAP_SERV_GUARANTEED = 2
+L2CAP_SERV_NOTRAFIC = 0
diff --git a/sys/linux/l2cap_arm.const b/sys/linux/l2cap_arm.const
index 63e7d5c9b..3aaee975c 100644
--- a/sys/linux/l2cap_arm.const
+++ b/sys/linux/l2cap_arm.const
@@ -22,12 +22,22 @@ L2CAP_ECRED_CONN_REQ = 23
 L2CAP_ECRED_CONN_RSP = 24
 L2CAP_ECRED_RECONF_REQ = 25
 L2CAP_ECRED_RECONF_RSP = 26
+L2CAP_FCS_CRC16 = 1
+L2CAP_FCS_NONE = 0
 L2CAP_INFO_REQ = 10
 L2CAP_INFO_RSP = 11
 L2CAP_LE_CONN_REQ = 20
 L2CAP_LE_CONN_RSP = 21
 L2CAP_LE_CREDITS = 22
+L2CAP_MODE_BASIC = 0
+L2CAP_MODE_ERTM = 3
+L2CAP_MODE_FLOWCTL = 2
+L2CAP_MODE_RETRANS = 1
+L2CAP_MODE_STREAMING = 4
 L2CAP_MOVE_CHAN_CFM = 16
 L2CAP_MOVE_CHAN_CFM_RSP = 17
 L2CAP_MOVE_CHAN_REQ = 14
 L2CAP_MOVE_CHAN_RSP = 15
+L2CAP_SERV_BESTEFFORT = 1
+L2CAP_SERV_GUARANTEED = 2
+L2CAP_SERV_NOTRAFIC = 0
diff --git a/sys/linux/l2cap_arm64.const b/sys/linux/l2cap_arm64.const
index 63e7d5c9b..3aaee975c 100644
--- a/sys/linux/l2cap_arm64.const
+++ b/sys/linux/l2cap_arm64.const
@@ -22,12 +22,22 @@ L2CAP_ECRED_CONN_REQ = 23
 L2CAP_ECRED_CONN_RSP = 24
 L2CAP_ECRED_RECONF_REQ = 25
 L2CAP_ECRED_RECONF_RSP = 26
+L2CAP_FCS_CRC16 = 1
+L2CAP_FCS_NONE = 0
 L2CAP_INFO_REQ = 10
 L2CAP_INFO_RSP = 11
 L2CAP_LE_CONN_REQ = 20
 L2CAP_LE_CONN_RSP = 21
 L2CAP_LE_CREDITS = 22
+L2CAP_MODE_BASIC = 0
+L2CAP_MODE_ERTM = 3
+L2CAP_MODE_FLOWCTL = 2
+L2CAP_MODE_RETRANS = 1
+L2CAP_MODE_STREAMING = 4
 L2CAP_MOVE_CHAN_CFM = 16
 L2CAP_MOVE_CHAN_CFM_RSP = 17
 L2CAP_MOVE_CHAN_REQ = 14
 L2CAP_MOVE_CHAN_RSP = 15
+L2CAP_SERV_BESTEFFORT = 1
+L2CAP_SERV_GUARANTEED = 2
+L2CAP_SERV_NOTRAFIC = 0
diff --git a/sys/linux/l2cap_mips64le.const b/sys/linux/l2cap_mips64le.const
index 63e7d5c9b..3aaee975c 100644
--- a/sys/linux/l2cap_mips64le.const
+++ b/sys/linux/l2cap_mips64le.const
@@ -22,12 +22,22 @@ L2CAP_ECRED_CONN_REQ = 23
 L2CAP_ECRED_CONN_RSP = 24
 L2CAP_ECRED_RECONF_REQ = 25
 L2CAP_ECRED_RECONF_RSP = 26
+L2CAP_FCS_CRC16 = 1
+L2CAP_FCS_NONE = 0
 L2CAP_INFO_REQ = 10
 L2CAP_INFO_RSP = 11
 L2CAP_LE_CONN_REQ = 20
 L2CAP_LE_CONN_RSP = 21
 L2CAP_LE_CREDITS = 22
+L2CAP_MODE_BASIC = 0
+L2CAP_MODE_ERTM = 3
+L2CAP_MODE_FLOWCTL = 2
+L2CAP_MODE_RETRANS = 1
+L2CAP_MODE_STREAMING = 4
 L2CAP_MOVE_CHAN_CFM = 16
 L2CAP_MOVE_CHAN_CFM_RSP = 17
 L2CAP_MOVE_CHAN_REQ = 14
 L2CAP_MOVE_CHAN_RSP = 15
+L2CAP_SERV_BESTEFFORT = 1
+L2CAP_SERV_GUARANTEED = 2
+L2CAP_SERV_NOTRAFIC = 0
diff --git a/sys/linux/l2cap_ppc64le.const b/sys/linux/l2cap_ppc64le.const
index 63e7d5c9b..3aaee975c 100644
--- a/sys/linux/l2cap_ppc64le.const
+++ b/sys/linux/l2cap_ppc64le.const
@@ -22,12 +22,22 @@ L2CAP_ECRED_CONN_REQ = 23
 L2CAP_ECRED_CONN_RSP = 24
 L2CAP_ECRED_RECONF_REQ = 25
 L2CAP_ECRED_RECONF_RSP = 26
+L2CAP_FCS_CRC16 = 1
+L2CAP_FCS_NONE = 0
 L2CAP_INFO_REQ = 10
 L2CAP_INFO_RSP = 11
 L2CAP_LE_CONN_REQ = 20
 L2CAP_LE_CONN_RSP = 21
 L2CAP_LE_CREDITS = 22
+L2CAP_MODE_BASIC = 0
+L2CAP_MODE_ERTM = 3
+L2CAP_MODE_FLOWCTL = 2
+L2CAP_MODE_RETRANS = 1
+L2CAP_MODE_STREAMING = 4
 L2CAP_MOVE_CHAN_CFM = 16
 L2CAP_MOVE_CHAN_CFM_RSP = 17
 L2CAP_MOVE_CHAN_REQ = 14
 L2CAP_MOVE_CHAN_RSP = 15
+L2CAP_SERV_BESTEFFORT = 1
+L2CAP_SERV_GUARANTEED = 2
+L2CAP_SERV_NOTRAFIC = 0
diff --git a/sys/linux/l2cap_riscv64.const b/sys/linux/l2cap_riscv64.const
index 63e7d5c9b..3aaee975c 100644
--- a/sys/linux/l2cap_riscv64.const
+++ b/sys/linux/l2cap_riscv64.const
@@ -22,12 +22,22 @@ L2CAP_ECRED_CONN_REQ = 23
 L2CAP_ECRED_CONN_RSP = 24
 L2CAP_ECRED_RECONF_REQ = 25
 L2CAP_ECRED_RECONF_RSP = 26
+L2CAP_FCS_CRC16 = 1
+L2CAP_FCS_NONE = 0
 L2CAP_INFO_REQ = 10
 L2CAP_INFO_RSP = 11
 L2CAP_LE_CONN_REQ = 20
 L2CAP_LE_CONN_RSP = 21
 L2CAP_LE_CREDITS = 22
+L2CAP_MODE_BASIC = 0
+L2CAP_MODE_ERTM = 3
+L2CAP_MODE_FLOWCTL = 2
+L2CAP_MODE_RETRANS = 1
+L2CAP_MODE_STREAMING = 4
 L2CAP_MOVE_CHAN_CFM = 16
 L2CAP_MOVE_CHAN_CFM_RSP = 17
 L2CAP_MOVE_CHAN_REQ = 14
 L2CAP_MOVE_CHAN_RSP = 15
+L2CAP_SERV_BESTEFFORT = 1
+L2CAP_SERV_GUARANTEED = 2
+L2CAP_SERV_NOTRAFIC = 0
diff --git a/sys/linux/l2cap_s390x.const b/sys/linux/l2cap_s390x.const
index 63e7d5c9b..3aaee975c 100644
--- a/sys/linux/l2cap_s390x.const
+++ b/sys/linux/l2cap_s390x.const
@@ -22,12 +22,22 @@ L2CAP_ECRED_CONN_REQ = 23
 L2CAP_ECRED_CONN_RSP = 24
 L2CAP_ECRED_RECONF_REQ = 25
 L2CAP_ECRED_RECONF_RSP = 26
+L2CAP_FCS_CRC16 = 1
+L2CAP_FCS_NONE = 0
 L2CAP_INFO_REQ = 10
 L2CAP_INFO_RSP = 11
 L2CAP_LE_CONN_REQ = 20
 L2CAP_LE_CONN_RSP = 21
 L2CAP_LE_CREDITS = 22
+L2CAP_MODE_BASIC = 0
+L2CAP_MODE_ERTM = 3
+L2CAP_MODE_FLOWCTL = 2
+L2CAP_MODE_RETRANS = 1
+L2CAP_MODE_STREAMING = 4
 L2CAP_MOVE_CHAN_CFM = 16
 L2CAP_MOVE_CHAN_CFM_RSP = 17
 L2CAP_MOVE_CHAN_REQ = 14
 L2CAP_MOVE_CHAN_RSP = 15
+L2CAP_SERV_BESTEFFORT = 1
+L2CAP_SERV_GUARANTEED = 2
+L2CAP_SERV_NOTRAFIC = 0