1 files changed, 19 insertions, 1 deletions

diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index 4cca203992e8..fec5645944a4 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -43,6 +43,23 @@ static bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
         return 0;
 }
 
+/* Update the rfkill state */
+static void b43_rfkill_update_state(struct b43_wldev *dev)
+{
+        struct b43_rfkill *rfk = &(dev->wl->rfkill);
+
+        if (!dev->radio_hw_enable) {
+                rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;
+                return;
+        }
+
+        if (!dev->phy.radio_on)
+                rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;
+        else
+                rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
+
+}
+
 /* The poll callback for the hardware button. */
 static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
 {
@@ -60,6 +77,7 @@ static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
         if (unlikely(enabled != dev->radio_hw_enable)) {
                 dev->radio_hw_enable = enabled;
                 report_change = 1;
+                b43_rfkill_update_state(dev);
                 b43info(wl, "Radio hardware status changed to %s\n",
                         enabled ? "ENABLED" : "DISABLED");
         }
@@ -135,7 +153,7 @@ void b43_rfkill_init(struct b43_wldev *dev)
         snprintf(rfk->name, sizeof(rfk->name),
                  "b43-%s", wiphy_name(wl->hw->wiphy));
         rfk->rfkill->name = rfk->name;
-        rfk->rfkill->state = RFKILL_STATE_ON;
+        rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
         rfk->rfkill->data = dev;
         rfk->rfkill->toggle_radio = b43_rfkill_soft_toggle;
         rfk->rfkill->user_claim_unsupported = 1;