---

yaml --- r: 278188 b: refs/heads/master c: e53aac4 h: refs/heads/master v: v3
git-mirror · Nov 15, 2011 · fbc0dfe · fbc0dfe
1 parent 28e0465
commit fbc0dfe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6278ddab9f859b8d6311879d35f2b1f74a789964
+refs/heads/master: e53aac424767a9f42b3bbac22eb001491f605d4e
diff --git a/trunk/drivers/net/wireless/iwlegacy/4965-mac.c b/trunk/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -4944,6 +4944,8 @@ static const s8 default_queue_to_tx_fifo[] = {
 	IL_TX_FIFO_UNUSED,
 };
 
+#define IL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
+
 static int il4965_alive_notify(struct il_priv *il)
 {
 	u32 a;

diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-helpers.h b/trunk/drivers/net/wireless/iwlegacy/iwl-helpers.h
@@ -35,9 +35,6 @@
 
 #include "iwl-io.h"
 
-#define IL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
-
-
 /**
  * il_queue_inc_wrap - increment queue idx, wrap back to beginning
  * @idx -- current idx
-Original file line number
+Diff line change
@@ Expand Up / @@ -4944,6 +4944,8 @@ static const s8 default_queue_to_tx_fifo[] = { @@
     	IL_TX_FIFO_UNUSED,
     };
+    #define IL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
     static int il4965_alive_notify(struct il_priv *il)
     {
     	u32 a;
@@ Expand Down @@