build fix: if_llc.h: __packed__ is ignored if not after "}"
authorOleksij Rempel <linux@rempel-privat.de>
Mon, 18 Mar 2013 09:28:32 +0000 (10:28 +0100)
committerOleksij Rempel <linux@rempel-privat.de>
Sat, 30 Mar 2013 16:27:46 +0000 (17:27 +0100)
gcc ignores atribut __packed__ if it is not right after "}"

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
target_firmware/wlan/ieee80211.h
target_firmware/wlan/if_llc.h

index 8fc53ea21443650da3716896a391e194c9055f66..39418b1043eea4c5545eaa6387426455bbd17172 100755 (executable)
@@ -1008,7 +1008,7 @@ struct ieee80211_country_ie {
                a_uint8_t schan;                        /* starting channel */
                a_uint8_t nchan;                        /* number channels */
                a_uint8_t maxtxpwr;             /* tx power cap */
-       } band[4] adf_os_packed;                        /* up to 4 sub bands */
+       } adf_os_packed band[4];                        /* up to 4 sub bands */
 } adf_os_packed;
 
 #define IEEE80211_CHALLENGE_LEN                128
index 4fc7ee3d4ece189a2a1c3580412cfd704b2ef3db..f6d8e17e4de103588ce4018436fe3b4edd7f3ce8 100755 (executable)
@@ -94,15 +94,15 @@ struct llc {
                a_uint8_t format_id;
                a_uint8_t class;
                a_uint8_t window_x2;
-           } type_u adf_os_packed;
+           } adf_os_packed type_u;
            struct {
                a_uint8_t num_snd_x2;
                a_uint8_t num_rcv_x2;
-           } type_i adf_os_packed;
+           } adf_os_packed type_i;
            struct {
                a_uint8_t control;
                a_uint8_t num_rcv_x2;
-           } type_s adf_os_packed;
+           } adf_os_packed type_s;
            struct {
                a_uint8_t control;
                /*
@@ -114,16 +114,16 @@ struct llc {
                a_uint8_t frmr_control;
                a_uint8_t frmr_control_ext;
                a_uint8_t frmr_cause;
-           } type_frmr adf_os_packed;
+           } adf_os_packed type_frmr;
            struct {
                a_uint8_t  control;
                a_uint8_t  org_code[3];
                a_uint16_t ether_type;
-           } type_snap adf_os_packed;
+           } adf_os_packed type_snap;
            struct {
                a_uint8_t control;
                a_uint8_t control_ext;
-           } type_raw adf_os_packed;
+           } adf_os_packed type_raw;
        } llc_un /* XXX adf_os_packed ??? */;
 } adf_os_packed;