diff options
| author | John W. Linville | 2013-08-28 16:36:09 +0200 |
|---|---|---|
| committer | John W. Linville | 2013-08-28 16:36:09 +0200 |
| commit | b35c809708ad245a36bef94d6fb1e83f6ab850aa (patch) | |
| tree | c6dc6580546c9a5997eae06c8409f986c383d2a4 /drivers/net/wireless/iwlegacy | |
| parent | rt2800: fix wrong TX power compensation (diff) | |
| parent | ath9k: Enable PLL fix only for AR9340/AR9330 (diff) | |
| download | kernel-qcow2-linux-b35c809708ad245a36bef94d6fb1e83f6ab850aa.tar.gz kernel-qcow2-linux-b35c809708ad245a36bef94d6fb1e83f6ab850aa.tar.xz kernel-qcow2-linux-b35c809708ad245a36bef94d6fb1e83f6ab850aa.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
net/mac80211/ibss.c
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index b411ab905284..5ab50a5b48b1 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c @@ -4470,9 +4470,9 @@ il4965_irq_tasklet(struct il_priv *il) set_bit(S_RFKILL, &il->status); } else { clear_bit(S_RFKILL, &il->status); - wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill); il_force_reset(il, true); } + wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill); handled |= CSR_INT_BIT_RF_KILL; } |