linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: gavron@wetwork.net
To: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Broadcom Wireless <bcm43xx-dev@berlios.de>,
	wireless <linux-wireless@vger.kernel.org>
Subject: Re: Speed enhancement for BCM4306/2
Date: Sat, 06 Sep 2008 15:59:10 -0700	[thread overview]
Message-ID: <48C30B3E.2040302@wetwork.net> (raw)
In-Reply-To: <48C2A1F5.6020607@lwfinger.net>



Larry Finger wrote:
> gavron@wetwork.net wrote:
>>
>>
>>
>> Ok, here's try #2.
>> E
...
>
> This hunk does not match the specs. In addition, I think there are too 
> many right-hand curly braces for it to compile.
>
> Larry
>
I haven't tried a build yet, but please let me know if I'm on the right 
track.

E
# diff -uN /tmp/phy.c drivers/net/wireless/b43legacy/phy.c
--- /tmp/phy.c    2008-09-06 15:13:33.000000000 -0700
+++ drivers/net/wireless/b43legacy/phy.c    2008-09-06 
15:54:03.000000000 -0700
@@ -1010,7 +1010,7 @@
         b43legacy_phy_initb5(dev);
     else
         b43legacy_phy_initb6(dev);
-    if (phy->rev >= 2 || phy->gmode)
+    if (phy->rev >= 2 && phy->gmode)
         b43legacy_phy_inita(dev);
 
     if (phy->rev >= 2) {
@@ -1021,21 +1021,26 @@
         b43legacy_phy_write(dev, 0x0811, 0x0000);
         b43legacy_phy_write(dev, 0x0015, 0x00C0);
     }
-    if (phy->rev > 5) {
+    if (phy->rev >= 3) {
         b43legacy_phy_write(dev, 0x0811, 0x0400);
         b43legacy_phy_write(dev, 0x0015, 0x00C0);
     }
-    if (phy->rev >= 2 || phy->gmode) {
+    if (phy->gmode) {
         tmp = b43legacy_phy_read(dev, 0x0400) & 0xFF;
-        if (tmp == 3 || tmp == 5) {
+        if (tmp == 3) {
+            b43legacy_phy_write(dev, 0x04C2, 0x1816);
+            b43legacy_phy_write(dev, 0x04C3, 0x8606);
+        }
+        if (tmp == 4 || tmp == 5) {
             b43legacy_phy_write(dev, 0x04C2, 0x1816);
             b43legacy_phy_write(dev, 0x04C3, 0x8006);
-            if (tmp == 5)
-                b43legacy_phy_write(dev, 0x04CC,
-                            (b43legacy_phy_read(dev,
-                             0x04CC) & 0x00FF) |
-                             0x1F00);
+            b43legacy_phy_write(dev, 0x04CC,
+                        (b43legacy_phy_read(dev,
+                        0x04CC) & 0x00FF) |
+                        0x1F00);
         }
+    }
+    if (phy-->rev >= 2)
         b43legacy_phy_write(dev, 0x047E, 0x0078);
     }
     if (phy->radio_rev == 8) {



  parent reply	other threads:[~2008-09-06 22:59 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-05 23:02 Speed enhancement for BCM4306/2 Larry Finger
2008-09-06  4:38 ` gavron
2008-09-06  4:49   ` Larry Finger
2008-09-06  5:04     ` gavron
2008-09-06 10:41       ` Michael Buesch
2008-09-06 15:29       ` Larry Finger
2008-09-06 18:07         ` gavron
2008-09-06 18:11           ` Michael Buesch
2008-09-06 18:30           ` Larry Finger
2008-09-06 22:59         ` gavron [this message]
2008-09-06 23:28           ` Larry Finger
2008-09-06 23:46             ` gavron
2008-09-07  0:18               ` Larry Finger
2008-09-07  0:25                 ` gavron
2008-09-07  0:35                   ` Larry Finger
2008-09-07  0:41                     ` gavron
2008-09-07  0:14             ` gavron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=48C30B3E.2040302@wetwork.net \
    --to=gavron@wetwork.net \
    --cc=Larry.Finger@lwfinger.net \
    --cc=bcm43xx-dev@berlios.de \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).