9 files changed, 80 insertions, 5 deletions

diff --git a/sys/linux/l2cap.txt b/sys/linux/l2cap.txt
index 3bc4e608f..17ca6f27d 100644
--- a/sys/linux/l2cap.txt
+++ b/sys/linux/l2cap.txt
@@ -68,23 +68,50 @@ l2cap_cmd_rej_unk {
 	reason	int16
 } [packed]
 
-l2cap_conf_opt {
-	type	int8
+l2cap_conf_rfc {
+	mode		int8
+	txwin_size	int8
+	max_transmit	int8
+	retrans_timeout	int16
+	monitor_timeout	int16
+	max_pdu_size	int16
+} [packed]
+
+l2cap_conf_efs {
+	id		int8
+	stype		int8
+	msdu		int16
+	sdu_itime	int32
+	acc_lat		int32
+	flush_to	int32
+} [packed]
+
+type l2cap_conf_opt[TYPE, VAL] {
+	type	const[TYPE, int8]
 	len	bytesize[val, int8]
-	val	array[int8]
+	val	VAL
 } [packed]
 
+l2cap_conf_opt_un [
+	l2cap_conf_rfc		l2cap_conf_opt[L2CAP_CONF_RFC, l2cap_conf_rfc]
+	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_ews		l2cap_conf_opt[L2CAP_CONF_EWS, int16]
+] [varlen]
+
 l2cap_conf_req {
 	dcid	int16
 	flags	int16
-	data	array[l2cap_conf_opt]
+	data	array[l2cap_conf_opt_un]
 } [packed]
 
 l2cap_conf_rsp {
 	scid	int16
 	flags	int16
 	result	int16
-	data	array[l2cap_conf_opt]
+	data	array[l2cap_conf_opt_un]
 } [packed]
 
 l2cap_conn_param_update_req {
diff --git a/sys/linux/l2cap_386.const b/sys/linux/l2cap_386.const
index 58badeca5..63e7d5c9b 100644
--- a/sys/linux/l2cap_386.const
+++ b/sys/linux/l2cap_386.const
@@ -2,7 +2,13 @@
 L2CAP_CID_LE_SIGNALING = 5
 L2CAP_CID_SIGNALING = 1
 L2CAP_COMMAND_REJ = 1
+L2CAP_CONF_EFS = 6
+L2CAP_CONF_EWS = 7
+L2CAP_CONF_FCS = 5
+L2CAP_CONF_FLUSH_TO = 2
+L2CAP_CONF_MTU = 1
 L2CAP_CONF_REQ = 4
+L2CAP_CONF_RFC = 4
 L2CAP_CONF_RSP = 5
 L2CAP_CONN_PARAM_UPDATE_REQ = 18
 L2CAP_CONN_PARAM_UPDATE_RSP = 19
diff --git a/sys/linux/l2cap_amd64.const b/sys/linux/l2cap_amd64.const
index 58badeca5..63e7d5c9b 100644
--- a/sys/linux/l2cap_amd64.const
+++ b/sys/linux/l2cap_amd64.const
@@ -2,7 +2,13 @@
 L2CAP_CID_LE_SIGNALING = 5
 L2CAP_CID_SIGNALING = 1
 L2CAP_COMMAND_REJ = 1
+L2CAP_CONF_EFS = 6
+L2CAP_CONF_EWS = 7
+L2CAP_CONF_FCS = 5
+L2CAP_CONF_FLUSH_TO = 2
+L2CAP_CONF_MTU = 1
 L2CAP_CONF_REQ = 4
+L2CAP_CONF_RFC = 4
 L2CAP_CONF_RSP = 5
 L2CAP_CONN_PARAM_UPDATE_REQ = 18
 L2CAP_CONN_PARAM_UPDATE_RSP = 19
diff --git a/sys/linux/l2cap_arm.const b/sys/linux/l2cap_arm.const
index 58badeca5..63e7d5c9b 100644
--- a/sys/linux/l2cap_arm.const
+++ b/sys/linux/l2cap_arm.const
@@ -2,7 +2,13 @@
 L2CAP_CID_LE_SIGNALING = 5
 L2CAP_CID_SIGNALING = 1
 L2CAP_COMMAND_REJ = 1
+L2CAP_CONF_EFS = 6
+L2CAP_CONF_EWS = 7
+L2CAP_CONF_FCS = 5
+L2CAP_CONF_FLUSH_TO = 2
+L2CAP_CONF_MTU = 1
 L2CAP_CONF_REQ = 4
+L2CAP_CONF_RFC = 4
 L2CAP_CONF_RSP = 5
 L2CAP_CONN_PARAM_UPDATE_REQ = 18
 L2CAP_CONN_PARAM_UPDATE_RSP = 19
diff --git a/sys/linux/l2cap_arm64.const b/sys/linux/l2cap_arm64.const
index 58badeca5..63e7d5c9b 100644
--- a/sys/linux/l2cap_arm64.const
+++ b/sys/linux/l2cap_arm64.const
@@ -2,7 +2,13 @@
 L2CAP_CID_LE_SIGNALING = 5
 L2CAP_CID_SIGNALING = 1
 L2CAP_COMMAND_REJ = 1
+L2CAP_CONF_EFS = 6
+L2CAP_CONF_EWS = 7
+L2CAP_CONF_FCS = 5
+L2CAP_CONF_FLUSH_TO = 2
+L2CAP_CONF_MTU = 1
 L2CAP_CONF_REQ = 4
+L2CAP_CONF_RFC = 4
 L2CAP_CONF_RSP = 5
 L2CAP_CONN_PARAM_UPDATE_REQ = 18
 L2CAP_CONN_PARAM_UPDATE_RSP = 19
diff --git a/sys/linux/l2cap_mips64le.const b/sys/linux/l2cap_mips64le.const
index 58badeca5..63e7d5c9b 100644
--- a/sys/linux/l2cap_mips64le.const
+++ b/sys/linux/l2cap_mips64le.const
@@ -2,7 +2,13 @@
 L2CAP_CID_LE_SIGNALING = 5
 L2CAP_CID_SIGNALING = 1
 L2CAP_COMMAND_REJ = 1
+L2CAP_CONF_EFS = 6
+L2CAP_CONF_EWS = 7
+L2CAP_CONF_FCS = 5
+L2CAP_CONF_FLUSH_TO = 2
+L2CAP_CONF_MTU = 1
 L2CAP_CONF_REQ = 4
+L2CAP_CONF_RFC = 4
 L2CAP_CONF_RSP = 5
 L2CAP_CONN_PARAM_UPDATE_REQ = 18
 L2CAP_CONN_PARAM_UPDATE_RSP = 19
diff --git a/sys/linux/l2cap_ppc64le.const b/sys/linux/l2cap_ppc64le.const
index 58badeca5..63e7d5c9b 100644
--- a/sys/linux/l2cap_ppc64le.const
+++ b/sys/linux/l2cap_ppc64le.const
@@ -2,7 +2,13 @@
 L2CAP_CID_LE_SIGNALING = 5
 L2CAP_CID_SIGNALING = 1
 L2CAP_COMMAND_REJ = 1
+L2CAP_CONF_EFS = 6
+L2CAP_CONF_EWS = 7
+L2CAP_CONF_FCS = 5
+L2CAP_CONF_FLUSH_TO = 2
+L2CAP_CONF_MTU = 1
 L2CAP_CONF_REQ = 4
+L2CAP_CONF_RFC = 4
 L2CAP_CONF_RSP = 5
 L2CAP_CONN_PARAM_UPDATE_REQ = 18
 L2CAP_CONN_PARAM_UPDATE_RSP = 19
diff --git a/sys/linux/l2cap_riscv64.const b/sys/linux/l2cap_riscv64.const
index 58badeca5..63e7d5c9b 100644
--- a/sys/linux/l2cap_riscv64.const
+++ b/sys/linux/l2cap_riscv64.const
@@ -2,7 +2,13 @@
 L2CAP_CID_LE_SIGNALING = 5
 L2CAP_CID_SIGNALING = 1
 L2CAP_COMMAND_REJ = 1
+L2CAP_CONF_EFS = 6
+L2CAP_CONF_EWS = 7
+L2CAP_CONF_FCS = 5
+L2CAP_CONF_FLUSH_TO = 2
+L2CAP_CONF_MTU = 1
 L2CAP_CONF_REQ = 4
+L2CAP_CONF_RFC = 4
 L2CAP_CONF_RSP = 5
 L2CAP_CONN_PARAM_UPDATE_REQ = 18
 L2CAP_CONN_PARAM_UPDATE_RSP = 19
diff --git a/sys/linux/l2cap_s390x.const b/sys/linux/l2cap_s390x.const
index 58badeca5..63e7d5c9b 100644
--- a/sys/linux/l2cap_s390x.const
+++ b/sys/linux/l2cap_s390x.const
@@ -2,7 +2,13 @@
 L2CAP_CID_LE_SIGNALING = 5
 L2CAP_CID_SIGNALING = 1
 L2CAP_COMMAND_REJ = 1
+L2CAP_CONF_EFS = 6
+L2CAP_CONF_EWS = 7
+L2CAP_CONF_FCS = 5
+L2CAP_CONF_FLUSH_TO = 2
+L2CAP_CONF_MTU = 1
 L2CAP_CONF_REQ = 4
+L2CAP_CONF_RFC = 4
 L2CAP_CONF_RSP = 5
 L2CAP_CONN_PARAM_UPDATE_REQ = 18
 L2CAP_CONN_PARAM_UPDATE_RSP = 19