We should suspend the MAC, before we kill the radio. This gives the MAC a chance to leave any TX/RX state and it avoids races on the PHY/RADIO registers. Signed-off-by: Michael Buesch <mb@xxxxxxxxx> --- For 2.6.29 Index: wireless-testing/drivers/net/wireless/b43/phy_common.c =================================================================== --- wireless-testing.orig/drivers/net/wireless/b43/phy_common.c 2008-12-19 18:32:33.000000000 +0100 +++ wireless-testing/drivers/net/wireless/b43/phy_common.c 2008-12-19 18:35:49.000000000 +0100 @@ -293,14 +293,16 @@ void b43_software_rfkill(struct b43_wlde if (state == RFKILL_STATE_HARD_BLOCKED) { /* We cannot hardware-block the device */ state = RFKILL_STATE_SOFT_BLOCKED; } + b43_mac_suspend(dev); phy->ops->software_rfkill(dev, state); phy->radio_on = (state == RFKILL_STATE_UNBLOCKED); + b43_mac_enable(dev); } /** * b43_phy_txpower_adjust_work - TX power workqueue. * * Workqueue for updating the TX power parameters in hardware. -- Greetings, Michael. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html