diff --git a/lib/hci.h b/lib/hci.h
index c484823..56c9316 100644
--- a/lib/hci.h
+++ b/lib/hci.h
@@ -1410,16 +1410,17 @@ typedef struct {
 #define OCF_READ_LOCAL_AMP_ASSOC	0x000A
 typedef struct {
 	uint8_t		handle;
-	uint16_t	len_so_far;
-	uint16_t	max_len;
+	uint16_t	length_so_far;
+	uint16_t	assoc_length;
 } __attribute__ ((packed)) read_local_amp_assoc_cp;
-
+#define READ_LOCAL_AMP_ASSOC_CP_SIZE 5
 typedef struct {
 	uint8_t		status;
 	uint8_t		handle;
-	uint16_t	rem_len;
-	uint8_t		frag[0];
+	uint16_t	length;
+	uint8_t		fragment[HCI_MAX_NAME_LENGTH];
 } __attribute__ ((packed)) read_local_amp_assoc_rp;
+#define READ_LOCAL_AMP_ASSOC_RP_SIZE 252
 
 #define OCF_WRITE_REMOTE_AMP_ASSOC	0x000B
 typedef struct {