ath9k: Re-enable interrupts after a channel change failure
PATCH 1/1 ath9k: Re-enable interrupts after a channel change failure
Re-enable interrupts after a channel change failure, since ath_complete_reset will not be called. Also schedule a reset as a best effort method to recover the chip from whatever state caused the channel change failure.
--- drivers/net/wireless/ath/ath9k/main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
(quoted diff) +0 -0
b/drivers/net/wireless/ath/ath9k/main.c
index 24650fd..0567ac9 100644
drivers/net/wireless/ath/ath9k/main.c +0 -0
@@ -280,6 +280,12 @@ 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_set_interrupts(ah);
+ ath9k_hw_enable_interrupts(ah);
+
+ ath9k_queue_reset(sc, RESET_TYPE_BB_HANG); +
goto out;
}
--
1.7.1
PATCH 1/1 ath9k: Re-enable interrupts after a channel change failure
You filed a bug against this, right? Can you mention the bug report in there?
(What's the "blessed" way to mention a bugzilla.kernel.org bug in a linux git commit?)
adrian
Quoted 31 lines · Robert Shade
Re-enable interrupts after a channel change failure, since
ath_complete_resetwill not be called. Also schedule a reset as a best effort method to recover the chip from whatever state caused the channel change failure.Signed-off-by Robert Shade <[email protected]>--- drivers/net/wireless/ath/ath9k/main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)drivers/net/wireless/ath/ath9k/main.c +6
-1@@ -280,6 +280,12 @@ 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_set_interrupts (ah); +ath9k_hw_enable_interrupts (ah); + +ath9k_queue_reset (sc,RESET_TYPE_BB_HANG ); + goto out; } --1.7.1
PATCH 1/1 ath9k: Re-enable interrupts after a channel change failure
Yes, https://bugzilla.kernel.org/show_bug.cgi?id=55771
It was actually at the bottom of my commit message, but now I see that it was cut off by git format-patch
Quoted 41 lines · Adrian Chadd
You filed a bug against this, right? Can you mention the bug report in there?
(What's the "blessed" way to mention a bugzilla.kernel.org bug in a linux git commit?)
adrian
Quoted 29 lines · Robert Shade
Re-enable interrupts after a channel change failure, since
ath_complete_resetwill not be called. Also schedule a reset as a best effort method to recover the chip from whatever state caused the channel change failure.Signed-off-by Robert Shade <[email protected]>--- drivers/net/wireless/ath/ath9k/main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)drivers/net/wireless/ath/ath9k/main.c +6
-0@@ -280,6 +280,12 @@ 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_set_interrupts (ah); +ath9k_hw_enable_interrupts (ah); + +ath9k_queue_reset (sc,RESET_TYPE_BB_HANG ); + goto out; }
Quoted 3 lines
Quoted 2 lines
--
1.7.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20130401/c51e4782/attachment-0001.htm
PATCH 1/1 ath9k: Re-enable interrupts after a channel change failure
In reply to Adrian ChaddQuoted 4 lines · Adrian Chadd
You filed a bug against this, right? Can you mention the bug report in there?
(What's the "blessed" way to mention a bugzilla.kernel.org bug in a linux git commit?)
I usually just include the URL. "Fixes Bug #12345" would suffice as well.
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you linville at tuxdriver.com might be all we have. Be ready.
PATCH 1/1 ath9k: Re-enable interrupts after a channel change failure
In reply to Robert ShadeQuoted 6 lines · Robert Shade
Re-enable interrupts after a channel change failure, since
ath_complete_resetwill not be called. Also schedule a reset as a best effort method to recover the chip from whatever state caused the channel change failure.Signed-off-by Robert Shade <[email protected]>
Your patch is badly whitespace damaged.
Quoted 10 lines
--- drivers/net/wireless/ath/ath9k/main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)drivers/net/wireless/ath/ath9k/main.c +0
-0
drivers/net/wireless/ath/ath9k/main.c static int ath_reset_internal(struct ath_softc · line 285
Quoted 6 lines
drivers/net/wireless/ath/ath9k/main.c +2
-0@@ -280,6 +280,12 @@ 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_set_interrupts (ah);
Why the call to ath9k_hw_set_interrupts here?
Quoted 6 lines
drivers/net/wireless/ath/ath9k/main.c +4
-0+ath9k_hw_enable_interrupts (ah); + +ath9k_queue_reset (sc,RESET_TYPE_BB_HANG ); + goto out; }
PATCH 1/1 ath9k: Re-enable interrupts after a channel change failure
Quoted 1 line · Felix Fietkau
Your patch is badly whitespace damaged.
Ouch, must be the gmail web client. I'll resubmit a fixed one.
Quoted 1 line
Why the call to
ath9k_hw_set_interruptshere?
Simply because that's what ath_complete_reset does
PATCH 1/1 ath9k: Re-enable interrupts after a channel change failure
Quoted 8 lines · Robert Shade
Quoted 1 line · Felix Fietkau
Your patch is badly whitespace damaged.
Ouch, must be the gmail web client. I'll resubmit a fixed one.
Quoted 1 line
Why the call to
ath9k_hw_set_interruptshere?Simply because that's what
ath_complete_resetdoes
OK. You can leave it out, because it's not required for interrupt-disable refcounting, and it will be called again after a successful reset.
- Felix