diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-23 14:43:45 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-23 14:43:45 -0400 |
| commit | 3b51cc996e81d8a113416d8094fa4a88f8360a51 (patch) | |
| tree | e75b98b228bb4e456c30673fcc4b56ffa1d09cf5 /drivers/net/wireless/iwlwifi/iwl-commands.h | |
| parent | c68ed255265968c3948fa2678bf59d15c471b055 (diff) | |
| parent | 672724403b42da1d276c6cf811e8e34d15efd964 (diff) | |
Merge branch 'master' into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/phy.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c
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 d830086ca195..67c723cc32d2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
| @@ -1443,7 +1443,7 @@ struct iwl4965_rx_mpdu_res_start { | |||
| 1443 | 1443 | ||
| 1444 | /* 1: Ignore Bluetooth priority for this frame. | 1444 | /* 1: Ignore Bluetooth priority for this frame. |
| 1445 | * 0: Delay Tx until Bluetooth device is done (normal usage). */ | 1445 | * 0: Delay Tx until Bluetooth device is done (normal usage). */ |
| 1446 | #define TX_CMD_FLG_BT_DIS_MSK cpu_to_le32(1 << 12) | 1446 | #define TX_CMD_FLG_IGNORE_BT cpu_to_le32(1 << 12) |
| 1447 | 1447 | ||
| 1448 | /* 1: uCode overrides sequence control field in MAC header. | 1448 | /* 1: uCode overrides sequence control field in MAC header. |
| 1449 | * 0: Driver provides sequence control field in MAC header. | 1449 | * 0: Driver provides sequence control field in MAC header. |