[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1290978008-29095-9-git-send-email-penberg@kernel.org>
Date: Sun, 28 Nov 2010 23:00:04 +0200
From: Pekka Enberg <penberg@...nel.org>
To: gregkh@...e.de
Cc: linux-kernel@...r.kernel.org, Pekka Enberg <penberg@...nel.org>,
Pavel Machek <pavel@....cz>
Subject: [PATCH 09/13] w35und: Kill _IBSS_BEACON_SEQ_STICK_
This patch kills the _IBSS_BEACON_SEQ_STICK_ ifdefs because the macro is never
defined.
Cc: Pavel Machek <pavel@....cz>
Signed-off-by: Pekka Enberg <penberg@...nel.org>
---
drivers/staging/winbond/mlmetxrx_f.h | 4 ----
drivers/staging/winbond/reg.c | 4 ----
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h
index 012507f..6db423b 100644
--- a/drivers/staging/winbond/mlmetxrx_f.h
+++ b/drivers/staging/winbond/mlmetxrx_f.h
@@ -16,8 +16,4 @@ void
MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID,
unsigned char SendOK);
-#ifdef _IBSS_BEACON_SEQ_STICK_
-s8 SendBCNullData(struct wbsoft_priv *adapter, u16 wIdx);
-#endif
-
#endif
diff --git a/drivers/staging/winbond/reg.c b/drivers/staging/winbond/reg.c
index 4d2c6a1..1b38d6d 100644
--- a/drivers/staging/winbond/reg.c
+++ b/drivers/staging/winbond/reg.c
@@ -2064,11 +2064,7 @@ void Mxx_initial(struct hw_data *pHwData)
*/
/* M00 bit set */
- #ifdef _IBSS_BEACON_SEQ_STICK_
- reg->M00_MacControl = 0; /* Solve beacon sequence number stop by software */
- #else
reg->M00_MacControl = 0x80000000; /* Solve beacon sequence number stop by hardware */
- #endif
/* M24 disable enter power save, BB RxOn and enable NAV attack */
reg->M24_MacControl = 0x08040042;
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists