From d9eaee8b10adb2a3dd3181e9f4b7a3526beb4647 Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Sat, 12 Sep 2009 00:52:48 +0200 Subject: [PATCH] --- yaml --- r: 166275 b: refs/heads/master c: 09ebe2f94373e95952ed6340b0a5d21739eb99da h: refs/heads/master i: 166273: 9fe39f7b0e751c00d5779f9b01e35c0b66a8dc35 166271: 06fccff4f8ca60597efc65a14cc32a1b65d29a85 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/main.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b6c87583611d..080c2161070f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 990b86f4f9c54f83085d4136498ac44719b17654 +refs/heads/master: 09ebe2f94373e95952ed6340b0a5d21739eb99da diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c index 6468bbeba687..7fa947ca7c32 100644 --- a/trunk/drivers/net/wireless/b43/main.c +++ b/trunk/drivers/net/wireless/b43/main.c @@ -2675,6 +2675,20 @@ static void b43_adjust_opmode(struct b43_wldev *dev) cfp_pretbtt = 50; } b43_write16(dev, 0x612, cfp_pretbtt); + + /* FIXME: We don't currently implement the PMQ mechanism, + * so always disable it. If we want to implement PMQ, + * we need to enable it here (clear DISCPMQ) in AP mode. + */ + if (0 /* ctl & B43_MACCTL_AP */) { + b43_write32(dev, B43_MMIO_MACCTL, + b43_read32(dev, B43_MMIO_MACCTL) + & ~B43_MACCTL_DISCPMQ); + } else { + b43_write32(dev, B43_MMIO_MACCTL, + b43_read32(dev, B43_MMIO_MACCTL) + | B43_MACCTL_DISCPMQ); + } } static void b43_rate_memory_write(struct b43_wldev *dev, u16 rate, int is_ofdm)