rpms/kernel/devel linux-2.6-bcm43xx-revert-breakage.patch,1.2,1.3

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5633

Modified Files:
	linux-2.6-bcm43xx-revert-breakage.patch 
Log Message:
oops, that fix already came in via wireless-dev

linux-2.6-bcm43xx-revert-breakage.patch:

Index: linux-2.6-bcm43xx-revert-breakage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-bcm43xx-revert-breakage.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-bcm43xx-revert-breakage.patch	31 Jul 2007 13:08:48 -0000	1.2
+++ linux-2.6-bcm43xx-revert-breakage.patch	31 Jul 2007 13:12:22 -0000	1.3
@@ -25,39 +25,3 @@
  		value = bcm43xx_phy_read(bcm, 0x0060) & ~0x003C;
  		value |= (baseband_attenuation << 2) & 0x003C;
  	} else {
-From: Larry Finger <Larry.Finger at lwfinger.net>
-To: John Linville <linville at tuxdriver.com>, Michael Buesch <mb at bu3sch.de>
-Subject: [PATCH V2] bcm43xx-mac80211: Fix specs typo for baseband
-	attenuation
-
-A typo in the specs interchanges the branches in an if statement, which
-breaks operations for a BCM4306/rev 2 that has phy->analog == 1.
-
-Signed-off-by: Larry Finger<Larry.Finger at lwfinger.net>
----
-
-John and Michael,
-
-This patch is made for the wireless-dev tree after the bcm43xx-mac80211
-directory has been moved into drivers/net/wireless, but it needs to be
-applied to the wireless-mb tree as well.
-
-Larry
-
-Index: wireless-dev/drivers/net/wireless/bcm43xx-mac80211/bcm43xx_phy.c
-===================================================================
---- wireless-dev/net/wireless/bcm43xx-mac80211/bcm43xx_phy.c
-+++ wireless-dev/drivers/net/wireless/bcm43xx-mac80211/bcm43xx_phy.c
-@@ -1895,7 +1895,7 @@ void bcm43xx_phy_set_baseband_attenuatio
- 		bcm43xx_write16(dev, BCM43xx_MMIO_PHY0,
- 				(bcm43xx_read16(dev, BCM43xx_MMIO_PHY0)
- 				 & 0xFFF0) | baseband_attenuation);
--	} else if (phy->analog == 1) {
-+	} else if (phy->analog > 1) {
- 		bcm43xx_phy_write(dev, BCM43xx_PHY_DACCTL,
- 				  (bcm43xx_phy_read(dev, BCM43xx_PHY_DACCTL)
- 				   & 0xFFC3) | (baseband_attenuation << 2));
-_______________________________________________
-Bcm43xx-dev mailing list
-Bcm43xx-dev at lists.berlios.de
-https://lists.berlios.de/mailman/listinfo/bcm43xx-dev