From: Oleksij Rempel <linux@rempel-privat.de>
Date: Mon, 18 Mar 2013 09:28:32 +0000 (+0100)
Subject: build fix: if_llc.h: __packed__ is ignored if not after "}"
X-Git-Tag: 1.3.2~12^2~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3fe2869d41352c3a0932607da9a212b0e6399c7f;p=librecmc%2Fopen-ath9k-htc-firmware.git

build fix: if_llc.h: __packed__ is ignored if not after "}"

gcc ignores atribut __packed__ if it is not right after "}"

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
---

diff --git a/target_firmware/wlan/ieee80211.h b/target_firmware/wlan/ieee80211.h
index 8fc53ea..39418b1 100755
--- a/target_firmware/wlan/ieee80211.h
+++ b/target_firmware/wlan/ieee80211.h
@@ -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
diff --git a/target_firmware/wlan/if_llc.h b/target_firmware/wlan/if_llc.h
index 4fc7ee3..f6d8e17 100755
--- a/target_firmware/wlan/if_llc.h
+++ b/target_firmware/wlan/if_llc.h
@@ -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;