aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2008-04-05 09:19:36 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-04-08 16:44:44 -0400
commit8cf6a31e8d30cae1fbec8c782842f00472a4495c (patch)
treed0795f208eed187ca7553f4fb08e4c41b218d740 /drivers
parent5042c5070daaa6a3c033e4510439e3ac02a1df60 (diff)
b43: use b43_is_mode() call
We must use the b43_is_mode() call to check the current interface operation mode. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/b43/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 1aa0f727174b..345c34bdae9a 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3771,7 +3771,7 @@ static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle)
3771 pu_delay = 3700; 3771 pu_delay = 3700;
3772 else 3772 else
3773 pu_delay = 1050; 3773 pu_delay = 1050;
3774 if ((dev->wl->if_type == IEEE80211_IF_TYPE_IBSS) || idle) 3774 if (b43_is_mode(dev->wl, IEEE80211_IF_TYPE_IBSS) || idle)
3775 pu_delay = 500; 3775 pu_delay = 500;
3776 if ((dev->phy.radio_ver == 0x2050) && (dev->phy.radio_rev == 8)) 3776 if ((dev->phy.radio_ver == 0x2050) && (dev->phy.radio_rev == 8))
3777 pu_delay = max(pu_delay, (u16)2400); 3777 pu_delay = max(pu_delay, (u16)2400);
@@ -3785,7 +3785,7 @@ static void b43_set_pretbtt(struct b43_wldev *dev)
3785 u16 pretbtt; 3785 u16 pretbtt;
3786 3786
3787 /* The time value is in microseconds. */ 3787 /* The time value is in microseconds. */
3788 if (dev->wl->if_type == IEEE80211_IF_TYPE_IBSS) { 3788 if (b43_is_mode(dev->wl, IEEE80211_IF_TYPE_IBSS)) {
3789 pretbtt = 2; 3789 pretbtt = 2;
3790 } else { 3790 } else {
3791 if (dev->phy.type == B43_PHYTYPE_A) 3791 if (dev->phy.type == B43_PHYTYPE_A)