From aafc4f7abd53c09a87117125e48ef63922676a64 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Mon, 28 Dec 2020 23:10:34 +0100
Subject: [PATCH] att_server: pull up att_connection_t from att_server into
 hci_connection_t

---
 src/ble/att_server.c | 2 +-
 src/hci.h            | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ble/att_server.c b/src/ble/att_server.c
index c2004925d..af0347e0c 100644
--- a/src/ble/att_server.c
+++ b/src/ble/att_server.c
@@ -107,7 +107,7 @@ static att_write_callback_t                   att_server_client_write_callback;
 static hci_con_handle_t att_server_last_can_send_now = HCI_CON_HANDLE_INVALID;
 
 static att_connection_t * att_connection_for_hci_connection(hci_connection_t * hci_connection){
-    return &hci_connection->att_server.connection;
+    return &hci_connection->att_connection;
 }
 
 #ifdef ENABLE_LE_SIGNED_WRITE
diff --git a/src/hci.h b/src/hci.h
index a9101eb8e..0e020d60d 100644
--- a/src/hci.h
+++ b/src/hci.h
@@ -448,8 +448,6 @@ typedef struct {
     int                     value_indication_handle;    
     btstack_timer_source_t  value_indication_timer;
 
-    att_connection_t        connection;
-
     btstack_linked_list_t   notification_requests;
     btstack_linked_list_t   indication_requests;
 
@@ -585,8 +583,12 @@ typedef struct {
     uint16_t le_max_tx_octets;
 #endif
 
+    // ATT Connection
+    att_connection_t att_connection;
+
     // ATT Server
     att_server_t    att_server;
+
 #endif
 
 #ifdef ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE