b43: Fix dual-PHY devices

PATCH New Michael Buesch 1 participant 1 message May 1, 2008

lore

Share & tools

lore

Michael Buesch

author

2008-05-01 10:32 UTC #0 lore raw

PATCH 1/1 b43: Fix dual-PHY devices

This fixes operation of dual-PHY (A/B/G) devices.
Do not anounce the A-PHY to mac80211, as that's not supported, yet.

This patch is in wireless-testing.git, commit
123082c124276b5e30b6a87ebe544a776c0ead7b

Signed-off-by Michael Buesch <[email protected]>

drivers/net/wireless/b43/main.c +8 -0

Index: linux-2.6.25/drivers/net/wireless/b43/main.c
===================================================================
@@ -3909,12 +3909,20 @@ static int b43_wireless_core_attach(stru
 	if (dev->phy.type == B43_PHYTYPE_A) {
 		/* FIXME */
 		b43err(wl, "IEEE 802.11a devices are unsupported\n");
 		err = -EOPNOTSUPP;
 		goto err_powerdown;
 	}
+	if (1 /* disable A-PHY */) {
+		/* FIXME: For now we disable the A-PHY on multi-PHY devices. */
+		if (dev->phy.type != B43_PHYTYPE_N) {
+			have_2ghz_phy = 1;
+			have_5ghz_phy = 0;
+		}
+	}
+
 	dev->phy.gmode = have_2ghz_phy;
 	tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0;
 	b43_wireless_core_reset(dev, tmp);
 
 	err = b43_validate_chipaccess(dev);
 	if (err)