summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8712/wifi.h
diff options
context:
space:
mode:
authorMichael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de>2011-06-20 16:34:27 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-05 10:23:57 -0700
commit40878364f1f461af2030bce0ea7d5f026d5a1dc2 (patch)
treee9560e7545c83f5dac853835998f590af56b7fb7 /drivers/staging/rtl8712/wifi.h
parent36e0b743d247b0aad58dc20753c38dfd05533aa1 (diff)
downloadop-kernel-dev-40878364f1f461af2030bce0ea7d5f026d5a1dc2.zip
op-kernel-dev-40878364f1f461af2030bce0ea7d5f026d5a1dc2.tar.gz
staging: rtl8712: Use __packed instead of __attribute__ ((packed))
According to scripts/checkpatch.pl, the __packed macro from linux/compiler.h should be used. Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/wifi.h')
-rw-r--r--drivers/staging/rtl8712/wifi.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/rtl8712/wifi.h b/drivers/staging/rtl8712/wifi.h
index 6032cdc..427ab7e 100644
--- a/drivers/staging/rtl8712/wifi.h
+++ b/drivers/staging/rtl8712/wifi.h
@@ -2,6 +2,7 @@
#define _WIFI_H_
#include "rtl871x_byteorder.h"
+#include <linux/compiler.h>
#ifdef BIT
#undef BIT
@@ -523,7 +524,7 @@ struct ieee80211_bar {
unsigned char ta[6];
unsigned short control;
unsigned short start_seq_num;
-} __attribute__((packed));
+} __packed;
/* 802.11 BAR control masks */
#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL 0x0000
@@ -544,7 +545,7 @@ struct ieee80211_ht_cap {
unsigned short extended_ht_cap_info;
unsigned int tx_BF_cap_info;
unsigned char antenna_selection_info;
-} __attribute__ ((packed));
+} __packed;
/**
* struct ieee80211_ht_cap - HT additional information
@@ -558,7 +559,7 @@ struct ieee80211_ht_addt_info {
unsigned short operation_mode;
unsigned short stbc_param;
unsigned char basic_set[16];
-} __attribute__ ((packed));
+} __packed;
/* 802.11n HT capabilities masks */
#define IEEE80211_HT_CAP_SUP_WIDTH 0x0002
OpenPOWER on IntegriCloud