From fbc0dfe362b1f35a2121bdd4ce902f662b317b3c Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Wed, 31 Aug 2011 11:18:16 +0200 Subject: [PATCH] --- yaml --- r: 278188 b: refs/heads/master c: e53aac424767a9f42b3bbac22eb001491f605d4e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlegacy/4965-mac.c | 2 ++ trunk/drivers/net/wireless/iwlegacy/iwl-helpers.h | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8f29d62113dd..708abd0c08d3 100644 --- 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 index 2bab0fc34d10..dbe5bf2d5791 100644 --- 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 index eb5a287f2254..2db83fc32103 100644 --- 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