---

yaml --- r: 255853 b: refs/heads/master c: e7c6255 h: refs/heads/master i: 255851: 6beacbe v: v3
git-mirror · Jun 22, 2011 · d952c6d · d952c6d
1 parent cadf9d7
commit d952c6d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c1236e3af9c0a52e63c1c386413f13627e68e67
+refs/heads/master: e7c62552ec43c094ca523fc46b98181df364f49f
diff --git a/trunk/drivers/net/wireless/b43/phy_ht.c b/trunk/drivers/net/wireless/b43/phy_ht.c
@@ -59,6 +59,19 @@ static void b43_phy_ht_op_free(struct b43_wldev *dev)
 	phy->ht = NULL;
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/Radio/Switch%20Radio */
+static void b43_phy_ht_op_software_rfkill(struct b43_wldev *dev,
+					bool blocked)
+{
+	if (b43_read32(dev, B43_MMIO_MACCTL) & B43_MACCTL_ENABLED)
+		b43err(dev->wl, "MAC not suspended\n");
+
+	if (blocked) {
+		b43_phy_mask(dev, B43_PHY_HT_RF_CTL1, ~0);
+	} else {
+	}
+}
+
 static void b43_phy_ht_op_switch_analog(struct b43_wldev *dev, bool on)
 {
 	if (on) {
@@ -141,9 +154,7 @@ const struct b43_phy_operations b43_phyops_ht = {
 	.phy_maskset		= b43_phy_ht_op_maskset,
 	.radio_read		= b43_phy_ht_op_radio_read,
 	.radio_write		= b43_phy_ht_op_radio_write,
-	/*
 	.software_rfkill	= b43_phy_ht_op_software_rfkill,
-	*/
 	.switch_analog		= b43_phy_ht_op_switch_analog,
 	/*
 	.switch_channel		= b43_phy_ht_op_switch_channel,

diff --git a/trunk/drivers/net/wireless/b43/phy_ht.h b/trunk/drivers/net/wireless/b43/phy_ht.h
@@ -8,6 +8,8 @@
 #define B43_PHY_HT_TABLE_DATALO			0x073 /* Table data low */
 #define B43_PHY_HT_TABLE_DATAHI			0x074 /* Table data high */
 
+#define B43_PHY_HT_RF_CTL1			B43_PHY_EXTG(0x010)
+
 #define B43_PHY_HT_AFE_CTL1			B43_PHY_EXTG(0x110)
 #define B43_PHY_HT_AFE_CTL2			B43_PHY_EXTG(0x111)
 #define B43_PHY_HT_AFE_CTL3			B43_PHY_EXTG(0x114)