From 32b1e7ca00a3fdc2d0028b89a03c2f07034b9950 Mon Sep 17 00:00:00 2001
From: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Date: Mon, 9 Jul 2012 23:43:13 -0300
Subject: [PATCH] --- yaml --- r: 317861 b: refs/heads/master c:
 69a7cd7dd54d4d7a129c209a9586f850b13721bb h: refs/heads/master i:   317859:
 356b316944b27382005724492f9c365473f1261e v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.c | 3 ---
 trunk/drivers/staging/csr/drv.c                    | 1 -
 trunk/drivers/staging/csr/firmware.c               | 1 -
 trunk/drivers/staging/csr/mlme.c                   | 5 -----
 trunk/drivers/staging/csr/monitor.c                | 2 --
 trunk/drivers/staging/csr/sme_sys.c                | 1 -
 7 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index bb6fb29c56aa..c9244b578fdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d6f64ae16a38b485b164b8089f357343077d230
+refs/heads/master: 69a7cd7dd54d4d7a129c209a9586f850b13721bb
diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.c
index 91976b824a4e..5a86ff90253d 100644
--- a/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.c
+++ b/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.c
@@ -36,9 +36,6 @@
 #define MAILBOX2_TIMEOUT                5   /* in millisecs */
 #define MAILBOX2_ATTEMPTS               10  /* 50ms */
 
-#define MAILBOX2_RESET_ATTEMPTS         10
-#define MAILBOX2_RESET_TIMEOUT          5   /* in millisecs */
-
 #define RESET_SETTLE_DELAY              25  /* in millisecs */
 
 static CsrResult card_init_slots(card_t *card);
diff --git a/trunk/drivers/staging/csr/drv.c b/trunk/drivers/staging/csr/drv.c
index fbe86301816c..4be6d9533cd0 100644
--- a/trunk/drivers/staging/csr/drv.c
+++ b/trunk/drivers/staging/csr/drv.c
@@ -63,7 +63,6 @@ int coredump_max = CSR_WIFI_HIP_NUM_COREDUMP_BUFFERS;
 int run_bh_once = -1;          /* Set for scheduled interrupt mode, -1 = default */
 int bh_priority = -1;
 #ifdef CSR_WIFI_HIP_DEBUG_OFFLINE
-#define UNIFI_LOG_HIP_SIGNALS_FILTER_SIGNAL     (1 << 0)
 #define UNIFI_LOG_HIP_SIGNALS_FILTER_BULKDATA   (1 << 1)
 #define UNIFI_LOG_HIP_SIGNALS_FILTER_TIMESTAMP  (1 << 2)
 int log_hip_signals = 0;
diff --git a/trunk/drivers/staging/csr/firmware.c b/trunk/drivers/staging/csr/firmware.c
index 03da0d5c247a..98e27d6f440e 100644
--- a/trunk/drivers/staging/csr/firmware.c
+++ b/trunk/drivers/staging/csr/firmware.c
@@ -220,7 +220,6 @@ unifi_fw_read(void *ospriv, void *arg, CsrUint32 offset, void *buf, CsrUint32 le
 
 
 
-#define UNIFIHELPER_INIT_MODE_SMEEMB    0
 #define UNIFIHELPER_INIT_MODE_SMEUSER   2
 #define UNIFIHELPER_INIT_MODE_NATIVE    1
 
diff --git a/trunk/drivers/staging/csr/mlme.c b/trunk/drivers/staging/csr/mlme.c
index 790d5d77375f..ed767eccbb32 100644
--- a/trunk/drivers/staging/csr/mlme.c
+++ b/trunk/drivers/staging/csr/mlme.c
@@ -15,11 +15,6 @@
 #include "csr_wifi_hip_unifi.h"
 #include "unifi_priv.h"
 
-
-/* The additional time taken by the UniFi to do a scan per channel */
-#define SCAN_STARTUP_TIME       300 /* in millisecs */
-
-
 /*
  * ---------------------------------------------------------------------------
  * unifi_mlme_wait_for_reply
diff --git a/trunk/drivers/staging/csr/monitor.c b/trunk/drivers/staging/csr/monitor.c
index 8c35b7e9fc96..628782ad641e 100644
--- a/trunk/drivers/staging/csr/monitor.c
+++ b/trunk/drivers/staging/csr/monitor.c
@@ -242,9 +242,7 @@ netrx_prism(unifi_priv_t *priv,
     unsigned char *ptr;
     unsigned char *base;
     int ind_data_len = skb_orig->len - 2 - ETH_HLEN;
-#define WLANCAP_MAGIC_COOKIE_BASE 0x80211000
 #define WLANCAP_MAGIC_COOKIE_V1 0x80211001
-#define WLANCAP_MAGIC_COOKIE_V2 0x80211002
     struct avs_header_v1 {
         uint32  version;
         uint32  length;
diff --git a/trunk/drivers/staging/csr/sme_sys.c b/trunk/drivers/staging/csr/sme_sys.c
index 9c3aa7494604..5f38f9dbb986 100644
--- a/trunk/drivers/staging/csr/sme_sys.c
+++ b/trunk/drivers/staging/csr/sme_sys.c
@@ -1572,7 +1572,6 @@ void CsrWifiRouterMaPacketReqHandler(void* drvpriv, CsrWifiFsmEvent* msg)
     r = _sys_packet_req(priv, &signal, mareq->subscriptionHandle,
             mareq->frameLength, mareq->frame, snap_protocol);
 
-#define MAX_RETRY 2
     if (r && mareq->cfmRequested)
     {
         CsrWifiRouterMaPacketCfmSend(msg->source,interfaceTag,