diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
| commit | 7fe13c5733790ef582769a54693fa6a5abf3c032 (patch) | |
| tree | 567eb4394b642ddc81ff05521329d75d1cf47b88 /drivers/net/wireless/iwlwifi/iwl-commands.h | |
| parent | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (diff) | |
| parent | 10c435f18b8cb78a5870c08d52955594f5ec9c31 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-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 e5f40f35dc3f..ba3e4c837d87 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
| @@ -1164,7 +1164,7 @@ struct iwl_wep_cmd { | |||
| 1164 | #define RX_RES_PHY_FLAGS_MOD_CCK_MSK cpu_to_le16(1 << 1) | 1164 | #define RX_RES_PHY_FLAGS_MOD_CCK_MSK cpu_to_le16(1 << 1) |
| 1165 | #define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK cpu_to_le16(1 << 2) | 1165 | #define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK cpu_to_le16(1 << 2) |
| 1166 | #define RX_RES_PHY_FLAGS_NARROW_BAND_MSK cpu_to_le16(1 << 3) | 1166 | #define RX_RES_PHY_FLAGS_NARROW_BAND_MSK cpu_to_le16(1 << 3) |
| 1167 | #define RX_RES_PHY_FLAGS_ANTENNA_MSK cpu_to_le16(0xf0) | 1167 | #define RX_RES_PHY_FLAGS_ANTENNA_MSK 0xf0 |
| 1168 | #define RX_RES_PHY_FLAGS_ANTENNA_POS 4 | 1168 | #define RX_RES_PHY_FLAGS_ANTENNA_POS 4 |
| 1169 | 1169 | ||
| 1170 | #define RX_RES_STATUS_SEC_TYPE_MSK (0x7 << 8) | 1170 | #define RX_RES_STATUS_SEC_TYPE_MSK (0x7 << 8) |