[nuttx] branch master updated: compile/attribute: minor fix for packed struct mismatch

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new b5507ea9a2 compile/attribute: minor fix for packed struct mismatch
b5507ea9a2 is described below

commit b5507ea9a243400072396966448237a0e667f6d3
Author: chao an <anc...@xiaomi.com>
AuthorDate: Tue Dec 6 01:18:58 2022 +0800

    compile/attribute: minor fix for packed struct mismatch
    
    Signed-off-by: chao an <anc...@xiaomi.com>
---
 fs/spiffs/src/spiffs_core.h                  | 2 +-
 include/nuttx/wireless/ieee80211/ieee80211.h | 2 +-
 wireless/bluetooth/bt_att.h                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/spiffs/src/spiffs_core.h b/fs/spiffs/src/spiffs_core.h
index e600612372..405420db0c 100644
--- a/fs/spiffs/src/spiffs_core.h
+++ b/fs/spiffs/src/spiffs_core.h
@@ -423,7 +423,7 @@ begin_packed_struct struct spiffs_page_objndx_s
   struct spiffs_page_header_s phdr;
   uint8_t _align[4 - ((sizeof(struct spiffs_page_header_s) & 3) ==
                  0 ? 4 : (sizeof(struct spiffs_page_header_s) & 3))];
-} begin_packed_struct;
+} end_packed_struct;
 
 /* callback func for object lookup visitor */
 
diff --git a/include/nuttx/wireless/ieee80211/ieee80211.h 
b/include/nuttx/wireless/ieee80211/ieee80211.h
index b8414aa85a..792ee4a152 100644
--- a/include/nuttx/wireless/ieee80211/ieee80211.h
+++ b/include/nuttx/wireless/ieee80211/ieee80211.h
@@ -1175,7 +1175,7 @@ begin_packed_struct struct ieee80211_qosframe
 begin_packed_struct struct ieee80211_qoscntl
 {
   uint8_t  i_qos[2];
-};
+} end_packed_struct;
 
 begin_packed_struct struct ieee80211_frame_addr4
 {
diff --git a/wireless/bluetooth/bt_att.h b/wireless/bluetooth/bt_att.h
index 254f7296e8..99d1798501 100644
--- a/wireless/bluetooth/bt_att.h
+++ b/wireless/bluetooth/bt_att.h
@@ -321,7 +321,7 @@ begin_packed_struct struct bt_att_read_mult_rsp_s
 
 /* Read by Group Type Request */
 
-struct bt_att_read_group_req_s
+begin_packed_struct struct bt_att_read_group_req_s
 {
   uint16_t start_handle;
   uint16_t end_handle;