projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
hw.c
diff --git
a/drivers/net/wireless/ath/ath9k/hw.c
b/drivers/net/wireless/ath/ath9k/hw.c
index fe3537f6ec5838aead7c6489fa06afa35d80e64f..779d38a98a0e82c4a2e64cf676afef01fcbd1d59 100644
(file)
--- a/
drivers/net/wireless/ath/ath9k/hw.c
+++ b/
drivers/net/wireless/ath/ath9k/hw.c
@@
-147,10
+147,9
@@
static void ath9k_hw_set_clockrate(struct ath_hw *ah)
else
clockrate = ATH9K_CLOCK_RATE_5GHZ_OFDM;
- if (IS_CHAN_HT40(chan))
- clockrate *= 2;
-
- if (ah->curchan) {
+ if (chan) {
+ if (IS_CHAN_HT40(chan))
+ clockrate *= 2;
if (IS_CHAN_HALF_RATE(chan))
clockrate /= 2;
if (IS_CHAN_QUARTER_RATE(chan))