diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-08 18:55:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-08 18:55:21 -0400 |
| commit | 67972e0c238fa802580b5919f11e1de3da5179da (patch) | |
| tree | 27022c957154a9d36fc8aa0f020bed523e7849b3 /drivers/net/wireless/iwlwifi/iwl-commands.h | |
| parent | ad61df918c44316940404891d5082c63e79c256a (diff) | |
| parent | 8a8e05e5d8f6155788761961fc9845328863c16d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-commands.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index 2c5c88fc38f5..4afaf773aeac 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
| @@ -1154,7 +1154,7 @@ struct iwl_wep_cmd { | |||
| 1154 | #define RX_RES_PHY_FLAGS_MOD_CCK_MSK cpu_to_le16(1 << 1) | 1154 | #define RX_RES_PHY_FLAGS_MOD_CCK_MSK cpu_to_le16(1 << 1) |
| 1155 | #define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK cpu_to_le16(1 << 2) | 1155 | #define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK cpu_to_le16(1 << 2) |
| 1156 | #define RX_RES_PHY_FLAGS_NARROW_BAND_MSK cpu_to_le16(1 << 3) | 1156 | #define RX_RES_PHY_FLAGS_NARROW_BAND_MSK cpu_to_le16(1 << 3) |
| 1157 | #define RX_RES_PHY_FLAGS_ANTENNA_MSK cpu_to_le16(0xf0) | 1157 | #define RX_RES_PHY_FLAGS_ANTENNA_MSK 0xf0 |
| 1158 | #define RX_RES_PHY_FLAGS_ANTENNA_POS 4 | 1158 | #define RX_RES_PHY_FLAGS_ANTENNA_POS 4 |
| 1159 | 1159 | ||
| 1160 | #define RX_RES_STATUS_SEC_TYPE_MSK (0x7 << 8) | 1160 | #define RX_RES_STATUS_SEC_TYPE_MSK (0x7 << 8) |