linux-kernel - Re: 2.6.25-rc2 regression in rt61pci wireless driver

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <200802222047.52312.IvDoorn@gmail.com>
Date:	Fri, 22 Feb 2008 20:47:52 +0100
From:	Ivo van Doorn <ivdoorn@...il.com>
To:	"Chris Clayton" <chris2553@...glemail.com>
Cc:	linux-kernel@...r.kernel.org, linux-wireless@...r.kernel.org
Subject: Re: 2.6.25-rc2 regression in rt61pci wireless driver

On Friday 22 February 2008, Chris Clayton wrote:
> Hi Ivo,
> 
> On 18/02/2008, Ivo van Doorn <ivdoorn@...il.com> wrote:
> > Hi,
> >
> 
> [...]
> 
> > Above traces should be enough, but to determine where rt2x00 broke
> >  down approximatly I need to have a few test result on specific moments.
> >  Could you test the kernel with the following versions:
> >
> >  rt2x00 2.0.11   2d68de3efa62655d551092f5c787505735d561ad
> >  rt2x00 2.0.12   a3c7aa58df7df80aa05f166fe3e42482247164cf
> >  rt2x00 2.0.13   5a6012e105ae1664cd2841c33bf59fbdd8d4dbcc
> >
> >  Checking those out is simply a matter of:
> >  git branch 2.0.11 2d68de3efa62655d551092f5c787505735d561ad
> >  git checkout 2.0.11
> >
> 
> OK, we seem to be struggling a little, so I've built an installed git
> and cloned Linus' 2.6 tree. My wireless network dies after a few pings
> with rt2x00 2.0.11.
> 
> >  No further bisecting is needed, but with above tests I can at least
> >  narrow it down to find the cause of this issue.
> >
> 
> If you need me to bisect, just shout. Please be patient though, I'm
> exploring new territory here :-)

I don't think bisecting this will help a lot, the rt2x00 2.0.11 release
introduced software diversity. And that is already something I suspect
of being broken.

Unfortunately software diversity was a bugfix and fix in one,
the previous setup was broken for some hardware since the
lack of software diversity caused problems.

Could you check if below patch helps in any way?

Ivo

---

diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index a1d8e33..6995912 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -122,6 +122,10 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
 	libconf.ant.rx = rx;
 	libconf.ant.tx = tx;
 
+	if (rx == rt2x00dev->link.ant.active.rx &&
+	    tx == rt2x00dev->link.ant.active.tx)
+		return;
+
 	/*
 	 * Antenna setup changes require the RX to be disabled,
 	 * else the changes will be ignored by the device.
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 65a512f..4325c08 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -191,16 +191,16 @@ static void rt2x00lib_evaluate_antenna_sample(struct rt2x00_dev *rt2x00dev)
 		return;
 
 	if (rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY) {
-		if (sample_a > sample_b && rx == ANTENNA_B)
+		if (sample_a > sample_b)
 			rx = ANTENNA_A;
-		else if (rx == ANTENNA_A)
+		else
 			rx = ANTENNA_B;
 	}
 
 	if (rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY) {
-		if (sample_a > sample_b && tx == ANTENNA_B)
+		if (sample_a > sample_b)
 			tx = ANTENNA_A;
-		else if (tx == ANTENNA_A)
+		else
 			tx = ANTENNA_B;
 	}
 
@@ -257,7 +257,7 @@ static void rt2x00lib_evaluate_antenna(struct rt2x00_dev *rt2x00dev)
 
 	if (!(rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY) &&
 	    !(rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY)) {
-		rt2x00dev->link.ant.flags &= ~ANTENNA_MODE_SAMPLE;
+		rt2x00dev->link.ant.flags = 0;
 		return;
 	}
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/