summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-07-14 10:37:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-07-14 13:52:46 -0400
commitbeabe91462919efaf4a97b5001d564027a894728 (patch)
treef00fa902b95b3f913a903f34dd7520a8c4386e54
parentb3f194e54bdbaa4d508488cab24d23c376e235a2 (diff)
downloadlinux-stable-beabe91462919efaf4a97b5001d564027a894728.tar.gz
linux-stable-beabe91462919efaf4a97b5001d564027a894728.tar.bz2
linux-stable-beabe91462919efaf4a97b5001d564027a894728.zip
libertas: convert new uses of __attribute__ ((packed)) to __packed
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/cfg.c6
-rw-r--r--drivers/net/wireless/libertas/host.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index f36cc970ad1b..7e0741608856 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/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/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index 112fbf167dc8..d70355cff908 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/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