diff options
author | Luciano Coelho <luciano.coelho@nokia.com> | 2010-07-09 07:10:58 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-07-12 16:05:31 -0400 |
commit | 72e93e9161a917017f6c3cac216d813088ec2d1f (patch) | |
tree | 11eabeaac988c36be0b1a2296324be744deb5da7 /drivers/net/wireless/wl12xx | |
parent | 1311843c58ca606bab8bfe4cf6c0fe50deb9986d (diff) |
wl1271: use __packed annotation
This patch changes __attribute__ ((packed)) annotations to __packed in wl1271
code that was introduced in a recent patch in wireless-testing.
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_acx.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_scan.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h index d915683fb645..dc9839070495 100644 --- a/drivers/net/wireless/wl12xx/wl1271_acx.h +++ b/drivers/net/wireless/wl12xx/wl1271_acx.h | |||
@@ -1002,7 +1002,7 @@ struct wl1271_acx_fw_tsf_information { | |||
1002 | __le32 last_tbtt_low; | 1002 | __le32 last_tbtt_low; |
1003 | u8 last_dtim_count; | 1003 | u8 last_dtim_count; |
1004 | u8 padding[3]; | 1004 | u8 padding[3]; |
1005 | } __attribute__ ((packed)); | 1005 | } __packed; |
1006 | 1006 | ||
1007 | enum { | 1007 | enum { |
1008 | ACX_WAKE_UP_CONDITIONS = 0x0002, | 1008 | ACX_WAKE_UP_CONDITIONS = 0x0002, |
diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.h b/drivers/net/wireless/wl12xx/wl1271_scan.h index b0e36e30a427..f1815700f5f9 100644 --- a/drivers/net/wireless/wl12xx/wl1271_scan.h +++ b/drivers/net/wireless/wl12xx/wl1271_scan.h | |||
@@ -76,7 +76,7 @@ struct basic_scan_params { | |||
76 | u8 use_ssid_list; | 76 | u8 use_ssid_list; |
77 | u8 scan_tag; | 77 | u8 scan_tag; |
78 | u8 padding2; | 78 | u8 padding2; |
79 | } __attribute__ ((packed)); | 79 | } __packed; |
80 | 80 | ||
81 | struct basic_scan_channel_params { | 81 | struct basic_scan_channel_params { |
82 | /* Duration in TU to wait for frames on a channel for active scan */ | 82 | /* Duration in TU to wait for frames on a channel for active scan */ |
@@ -91,19 +91,19 @@ struct basic_scan_channel_params { | |||
91 | u8 dfs_candidate; | 91 | u8 dfs_candidate; |
92 | u8 activity_detected; | 92 | u8 activity_detected; |
93 | u8 pad; | 93 | u8 pad; |
94 | } __attribute__ ((packed)); | 94 | } __packed; |
95 | 95 | ||
96 | struct wl1271_cmd_scan { | 96 | struct wl1271_cmd_scan { |
97 | struct wl1271_cmd_header header; | 97 | struct wl1271_cmd_header header; |
98 | 98 | ||
99 | struct basic_scan_params params; | 99 | struct basic_scan_params params; |
100 | struct basic_scan_channel_params channels[WL1271_SCAN_MAX_CHANNELS]; | 100 | struct basic_scan_channel_params channels[WL1271_SCAN_MAX_CHANNELS]; |
101 | } __attribute__ ((packed)); | 101 | } __packed; |
102 | 102 | ||
103 | struct wl1271_cmd_trigger_scan_to { | 103 | struct wl1271_cmd_trigger_scan_to { |
104 | struct wl1271_cmd_header header; | 104 | struct wl1271_cmd_header header; |
105 | 105 | ||
106 | __le32 timeout; | 106 | __le32 timeout; |
107 | } __attribute__ ((packed)); | 107 | } __packed; |
108 | 108 | ||
109 | #endif /* __WL1271_SCAN_H__ */ | 109 | #endif /* __WL1271_SCAN_H__ */ |