From 33312a766191eeb820ce6860fda19c48ca672697 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 14 Jul 2010 10:37:03 -0400
Subject: [PATCH] --- yaml --- r: 203709 b: refs/heads/master c:
 beabe91462919efaf4a97b5001d564027a894728 h: refs/heads/master i:   203707:
 79271961ebb91b69c8d0a96ceaf3bf0bf6065cc6 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wireless/libertas/cfg.c  | 6 +++---
 trunk/drivers/net/wireless/libertas/host.h | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index be0ac90d9b19..a067c06a65cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3f194e54bdbaa4d508488cab24d23c376e235a2
+refs/heads/master: beabe91462919efaf4a97b5001d564027a894728
diff --git a/trunk/drivers/net/wireless/libertas/cfg.c b/trunk/drivers/net/wireless/libertas/cfg.c
index f36cc970ad1b..7e0741608856 100644
--- a/trunk/drivers/net/wireless/libertas/cfg.c
+++ b/trunk/drivers/net/wireless/libertas/cfg.c
@@ -891,7 +891,7 @@ struct cmd_key_material {
 
 	__le16 action;
 	struct MrvlIEtype_keyParamSet param;
-} __attribute__ ((packed));
+} __packed;
 
 static int lbs_set_key_material(struct lbs_private *priv,
 				int key_type,
@@ -1395,7 +1395,7 @@ struct cmd_monitor_mode {
 
 	__le16 action;
 	__le16 mode;
-} __attribute__ ((packed));
+} __packed;
 
 static int lbs_enable_monitor_mode(struct lbs_private *priv, int mode)
 {
@@ -1450,7 +1450,7 @@ struct cmd_rssi {
 	__le16 nf;
 	__le16 avg_snr;
 	__le16 avg_nf;
-} __attribute__ ((packed));
+} __packed;
 
 static int lbs_get_signal(struct lbs_private *priv, s8 *signal, s8 *noise)
 {
diff --git a/trunk/drivers/net/wireless/libertas/host.h b/trunk/drivers/net/wireless/libertas/host.h
index 112fbf167dc8..d70355cff908 100644
--- a/trunk/drivers/net/wireless/libertas/host.h
+++ b/trunk/drivers/net/wireless/libertas/host.h
@@ -398,12 +398,12 @@ struct mrvl_ie_domain_param_set {
 
 	u8 countrycode[COUNTRY_CODE_LEN];
 	struct ieee80211_country_ie_triplet triplet[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11d_domain_info {
 	__le16 action;
 	struct mrvl_ie_domain_param_set domain;
-} __attribute__ ((packed));
+} __packed;
 
 struct lbs_802_11d_domain_reg {
 	/** Country code*/
@@ -411,7 +411,7 @@ struct lbs_802_11d_domain_reg {
 	/** No. of triplet*/
 	u8 no_triplet;
 	struct ieee80211_country_ie_triplet triplet[MRVDRV_MAX_TRIPLET_802_11D];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Define data structure for CMD_GET_HW_SPEC