From: Michael Buesch Date: Sat, 5 Apr 2008 13:19:36 +0000 (+0200) Subject: b43: use b43_is_mode() call X-Git-Tag: v2.6.26-rc1~1138^2~162 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cf6a31e8d30cae1fbec8c782842f00472a4495c;p=linux-2.6 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 Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 1aa0f72717..345c34bdae 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) 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)