diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-23 14:03:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-23 14:03:38 -0700 |
| commit | 2a88e7e559f2358f4e1422d0b0c0278a74136581 (patch) | |
| tree | b4e9e56dbde79fe7185cba511a1ffd85f5d2018e /drivers/net/wireless/iwlwifi/iwl-commands.h | |
| parent | 344e0f623cec5eba273db06fe57db080988d6b26 (diff) | |
| parent | 7a17a33c0da37f8d24222c967550d19dabf13617 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-commands.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index 8d2db9d22045..bd1ec933cd98 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h @@ -1245,7 +1245,7 @@ struct iwl_txfifo_flush_cmd { __le32 fifo_control; __le16 flush_control; __le16 reserved; -} __attribute__ ((packed)); +} __packed; /* * REPLY_WEP_KEY = 0x20 @@ -3035,7 +3035,8 @@ struct iwl39_statistics_tx { struct statistics_dbg { __le32 burst_check; __le32 burst_count; - __le32 reserved[4]; + __le32 wait_for_silence_timeout_cnt; + __le32 reserved[3]; } __packed; struct iwl39_statistics_div { @@ -3547,7 +3548,7 @@ struct iwl_sensitivity_cmd { struct iwl_enhance_sensitivity_cmd { __le16 control; /* always use "1" */ __le16 enhance_table[ENHANCE_HD_TABLE_SIZE]; /* use HD_* as index */ -} __attribute__ ((packed)); +} __packed; /** |