diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-29 14:02:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 14:02:13 -0700 |
| commit | 143b11c03cd42f2284efe5128afc057d8fc86c78 (patch) | |
| tree | 8186830c461b7933c26cdd00b69e4c737c5c88e7 /drivers/net/wireless/b43/rfkill.c | |
| parent | af01d537463714e36e2c96d2da35902b76cd6827 (diff) | |
| parent | 18c8adeb0244f823ba78a51e23f813fe68bc3c54 (diff) | |
| download | kernel-crypto-143b11c03cd42f2284efe5128afc057d8fc86c78.tar.gz kernel-crypto-143b11c03cd42f2284efe5128afc057d8fc86c78.tar.xz kernel-crypto-143b11c03cd42f2284efe5128afc057d8fc86c78.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43/rfkill.c')
| -rw-r--r-- | drivers/net/wireless/b43/rfkill.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c index fec5645944a..7b9e99adb8c 100644 --- a/drivers/net/wireless/b43/rfkill.c +++ b/drivers/net/wireless/b43/rfkill.c @@ -24,6 +24,7 @@ #include "rfkill.h" #include "b43.h" +#include "phy_common.h" #include <linux/kmod.h> @@ -114,11 +115,11 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state) goto out_unlock; } if (!dev->phy.radio_on) - b43_radio_turn_on(dev); + b43_software_rfkill(dev, state); break; case RFKILL_STATE_SOFT_BLOCKED: if (dev->phy.radio_on) - b43_radio_turn_off(dev, 0); + b43_software_rfkill(dev, state); break; default: b43warn(wl, "Received unexpected rfkill state %d.\n", state); |