From 1f76df08918a6f9d0a96998b04d00234c88e13aa Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Sat, 5 Apr 2008 15:19:36 +0200 Subject: [PATCH] --- yaml --- r: 90588 b: refs/heads/master c: 8cf6a31e8d30cae1fbec8c782842f00472a4495c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 19ca4a723321..74a6a48f62a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5042c5070daaa6a3c033e4510439e3ac02a1df60 +refs/heads/master: 8cf6a31e8d30cae1fbec8c782842f00472a4495c diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c index 1aa0f727174b..345c34bdae9a 100644 --- a/trunk/drivers/net/wireless/b43/main.c +++ b/trunk/drivers/net/wireless/b43/main.c @@ -3771,7 +3771,7 @@ static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle) 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); @@ -3785,7 +3785,7 @@ 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)