Skip to content

Commit

Permalink
wl1271: use __packed annotation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luciano Coelho authored and John W. Linville committed Jul 12, 2010
1 parent 1311843 commit 72e93e9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/wl12xx/wl1271_acx.h
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ struct wl1271_acx_fw_tsf_information {
__le32 last_tbtt_low;
u8 last_dtim_count;
u8 padding[3];
} __attribute__ ((packed));
} __packed;

enum {
ACX_WAKE_UP_CONDITIONS = 0x0002,
Expand Down
8 changes: 4 additions & 4 deletions drivers/net/wireless/wl12xx/wl1271_scan.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct basic_scan_params {
u8 use_ssid_list;
u8 scan_tag;
u8 padding2;
} __attribute__ ((packed));
} __packed;

struct basic_scan_channel_params {
/* Duration in TU to wait for frames on a channel for active scan */
Expand All @@ -91,19 +91,19 @@ struct basic_scan_channel_params {
u8 dfs_candidate;
u8 activity_detected;
u8 pad;
} __attribute__ ((packed));
} __packed;

struct wl1271_cmd_scan {
struct wl1271_cmd_header header;

struct basic_scan_params params;
struct basic_scan_channel_params channels[WL1271_SCAN_MAX_CHANNELS];
} __attribute__ ((packed));
} __packed;

struct wl1271_cmd_trigger_scan_to {
struct wl1271_cmd_header header;

__le32 timeout;
} __attribute__ ((packed));
} __packed;

#endif /* __WL1271_SCAN_H__ */

0 comments on commit 72e93e9

Please sign in to comment.