---

yaml --- r: 194487 b: refs/heads/master c: b2e8690 h: refs/heads/master i: 194485: a666e03 194483: bebde24 194479: bc36201 v: v3
git-mirror · Apr 16, 2010 · 7065d11 · 7065d11
1 parent 3e9f603
commit 7065d11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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.