]> err.no Git - linux-2.6/commitdiff
b43: use b43_is_mode() call
authorMichael Buesch <mb@bu3sch.de>
Sat, 5 Apr 2008 13:19:36 +0000 (15:19 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 8 Apr 2008 20:44:44 +0000 (16:44 -0400)
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>
drivers/net/wireless/b43/main.c

index 1aa0f727174b719cc5e6552e077afe6b706c6f75..345c34bdae9ad1d4d80f62471969fee6541f1336 100644 (file)
@@ -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)