linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Buesch <mb@bu3sch.de>
To: John Linville <linville@tuxdriver.com>
Cc: bcm43xx-dev@lists.berlios.de, linux-wireless@vger.kernel.org
Subject: [PATCH] b43: use b43_is_mode() call
Date: Sat, 5 Apr 2008 15:19:36 +0200	[thread overview]
Message-ID: <200804051519.36755.mb@bu3sch.de> (raw)

We must use the b43_is_mode() call to check the current interface
operation mode.

Signed-off-by: Michael Buesch <mb@bu3sch.de>

---

John, this is for 2.6.26.


Index: wireless-testing/drivers/net/wireless/b43/main.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/b43/main.c	2008-04-05 15:10:43.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43/main.c	2008-04-05 15:12:48.000000000 +0200
@@ -3768,13 +3768,13 @@ static void b43_set_synth_pu_delay(struc
 
 	/* The time value is in microseconds. */
 	if (dev->phy.type == B43_PHYTYPE_A)
 		pu_delay = 3700;
 	else
 		pu_delay = 1050;
-	if ((dev->wl->if_type == IEEE80211_IF_TYPE_IBSS) || idle)
+	if (b43_is_mode(dev->wl, IEEE80211_IF_TYPE_IBSS) || idle)
 		pu_delay = 500;
 	if ((dev->phy.radio_ver == 0x2050) && (dev->phy.radio_rev == 8))
 		pu_delay = max(pu_delay, (u16)2400);
 
 	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_SPUWKUP, pu_delay);
 }
@@ -3782,13 +3782,13 @@ static void b43_set_synth_pu_delay(struc
 /* Set the TSF CFP pre-TargetBeaconTransmissionTime. */
 static void b43_set_pretbtt(struct b43_wldev *dev)
 {
 	u16 pretbtt;
 
 	/* The time value is in microseconds. */
-	if (dev->wl->if_type == IEEE80211_IF_TYPE_IBSS) {
+	if (b43_is_mode(dev->wl, IEEE80211_IF_TYPE_IBSS)) {
 		pretbtt = 2;
 	} else {
 		if (dev->phy.type == B43_PHYTYPE_A)
 			pretbtt = 120;
 		else
 			pretbtt = 250;

                 reply	other threads:[~2008-04-05 13:20 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=200804051519.36755.mb@bu3sch.de \
    --to=mb@bu3sch.de \
    --cc=bcm43xx-dev@lists.berlios.de \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /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;
as well as URLs for NNTP newsgroup(s).