diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 15:31:39 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 15:31:39 +0200 |
| commit | 6fe5468f452c0c40348ebd4e737758a842286ca8 (patch) | |
| tree | befe5ab33c457a9e695b65be72600f383266e611 /drivers/net/wireless/ath | |
| parent | brcmfmac: only use ifidx from BDC header in brcmf_rx_frames() (diff) | |
| parent | rt2x00: rt2x00pci: fix build error on Ralink RT3x5x SoCs (diff) | |
| download | linux-6fe5468f452c0c40348ebd4e737758a842286ca8.tar.xz linux-6fe5468f452c0c40348ebd4e737758a842286ca8.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
Diffstat (limited to 'drivers/net/wireless/ath')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 2d251483da22..1bf52c88004a 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -280,6 +280,10 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan) if (r) { ath_err(common, "Unable to reset channel, reset status %d\n", r); + + ath9k_hw_enable_interrupts(ah); + ath9k_queue_reset(sc, RESET_TYPE_BB_HANG); + goto out; } |