From 7065d11c2bd5bcccbf82dc48d4c6df59c4da0bea Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 13 Apr 2010 01:04:32 -0700 Subject: [PATCH] --- yaml --- r: 194487 b: refs/heads/master c: b2e8690d5a4d1868ee12f50aa00c138bec985b3c h: refs/heads/master i: 194485: a666e037b451380b867929c07c9482e6a0bcc534 194483: bebde24bae582b304eeb22b04c7e21d5ef01c2d5 194479: bc36201660b9ac5f1bde204a281848c3dcd67952 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dbe01aa1f168..3df009247783 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65b52bde687b609dc9cfc63eaf31da24b4f5663a +refs/heads/master: b2e8690d5a4d1868ee12f50aa00c138bec985b3c diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h b/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h index d830086ca195..67c723cc32d2 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h @@ -1443,7 +1443,7 @@ struct iwl4965_rx_mpdu_res_start { /* 1: Ignore Bluetooth priority for this frame. * 0: Delay Tx until Bluetooth device is done (normal usage). */ -#define TX_CMD_FLG_BT_DIS_MSK cpu_to_le32(1 << 12) +#define TX_CMD_FLG_IGNORE_BT cpu_to_le32(1 << 12) /* 1: uCode overrides sequence control field in MAC header. * 0: Driver provides sequence control field in MAC header.