Staging: 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@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h
index 012507fc49e3b0c9bf30853e976a8d6d6c7abc6d..6db423bc667716494896a2f7731a5465f74a69c2 100644 (file)
--- 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 4d2c6a12a9518d40565facadf138bdc06e3d13e7..1b38d6d225c9ac9e982d3478c18fe5a07347a441 100644 (file)
--- 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;