Attachment 826668 Details for Bug 732029 – iwl3945_rfkill.patch

iwl3945_rfkill.patch

iwl3945_rfkill.patch (text/plain), 1.18 KB, created by Stanislaw Gruszka on 2013-11-20 14:20:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislaw Gruszka

Created: 2013-11-20 14:20:16 UTC

Size: 1.18 KB

patch

obsolete

>diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
>index dea3b50..74e2b0a 100644
>--- a/drivers/net/wireless/iwlegacy/3945-mac.c
>+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
>@@ -2202,6 +2202,9 @@ il3945_alive_start(struct il_priv *il)
> 	} else
> 		set_bit(S_RFKILL, &il->status);
> 
>+	wiphy_rfkill_set_hw_state(il->hw->wiphy,
>+				  test_bit(S_RFKILL, &il->status));
>+
> 	/* After the ALIVE response, we can send commands to 3945 uCode */
> 	set_bit(S_ALIVE, &il->status);
> 
>@@ -2397,7 +2400,7 @@ __il3945_up(struct il_priv *il)
> 	else {
> 		set_bit(S_RFKILL, &il->status);
> 		IL_WARN("Radio disabled by HW RF Kill switch\n");
>-		return -ENODEV;
>+		return 0;
> 	}
> 
> 	_il_wr(il, CSR_INT, 0xFFFFFFFF);
>@@ -2825,6 +2828,9 @@ il3945_mac_start(struct ieee80211_hw *hw)
> 	if (ret)
> 		goto out_release_irq;
> 
>+	if (il_is_rfkill(il))
>+		goto out;
>+
> 	D_INFO("Start UP work.\n");
> 
> 	/* Wait for START_ALIVE from ucode. Otherwise callbacks from
>@@ -2845,6 +2851,7 @@ il3945_mac_start(struct ieee80211_hw *hw)
> 	 * no need to poll the killswitch state anymore */
> 	cancel_delayed_work(&il->_3945.rfkill_poll);
> 
>+out:
> 	il->is_open = 1;
> 	D_MAC80211("leave\n");
> 	return 0;

Actions: View

Attachments on bug 732029: 520188 | 520189 | 826668