From: Pekka Enberg <penberg@kernel.org>
To: gregkh@suse.de
Cc: linux-kernel@vger.kernel.org, Pekka Enberg <penberg@kernel.org>,
Pavel Machek <pavel@ucw.cz>
Subject: [PATCH 09/13] w35und: Kill _IBSS_BEACON_SEQ_STICK_
Date: Sun, 28 Nov 2010 23:00:04 +0200 [thread overview]
Message-ID: <1290978008-29095-9-git-send-email-penberg@kernel.org> (raw)
In-Reply-To: <1290978008-29095-1-git-send-email-penberg@kernel.org>
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>
---
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
next prev parent reply other threads:[~2010-11-28 21:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-28 20:59 [PATCH 01/13] w35und: Remove unused defines from sysdef.h Pekka Enberg
2010-11-28 20:59 ` [PATCH 02/13] w35und: Kill _USE_FALLBACK_RATE_ macro Pekka Enberg
2010-11-28 20:59 ` [PATCH 03/13] w35und: Kill WPA2 definitions Pekka Enberg
2010-11-28 20:59 ` [PATCH 04/13] w35und: Kill unused code in mac_structures.h Pekka Enberg
2010-11-28 21:00 ` [PATCH 05/13] w35und: Use pr_debug() for debugging Pekka Enberg
2010-11-28 21:00 ` [PATCH 06/13] w35und: Remove empty sysdef.h header Pekka Enberg
2010-11-28 21:00 ` [PATCH 07/13] w35und: Kill Vendor2 ifdef from hal_init_hardware Pekka Enberg
2010-11-28 21:00 ` [PATCH 08/13] w35und: Kill write-only ->TxToggle Pekka Enberg
2010-11-28 21:00 ` Pekka Enberg [this message]
2010-11-28 21:00 ` [PATCH 10/13] w35und: Merge mlmetxrx.c to mds.c Pekka Enberg
2010-11-28 21:00 ` [PATCH 11/13] w35und: Kill wblinux_f.h header Pekka Enberg
2010-11-28 21:00 ` [PATCH 12/13] w35und: Remove unused fields from struct wb_usb Pekka Enberg
2010-11-28 21:00 ` [PATCH 13/13] w35und: Kill " Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1290978008-29095-9-git-send-email-penberg@kernel.org \
--to=penberg@kernel.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome