diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-06 09:50:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-06 09:50:45 -0500 |
| commit | e08fd975bf26aa8063cadd245817e042f570472d (patch) | |
| tree | 2b2a705710e6374cc037f89bcc7bfc25047485ba /drivers/net/wireless/ath/ath9k/hw.c | |
| parent | 251c9ba19143caa5eb5b6ec52c77c70c9d7b3d8f (diff) | |
| parent | a59b40b30f3f51bf5c56c15a7dc4da11b424a34b (diff) | |
| download | op-kernel-dev-e08fd975bf26aa8063cadd245817e042f570472d.zip op-kernel-dev-e08fd975bf26aa8063cadd245817e042f570472d.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index fe3537f..779d38a 100644 --- 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)) |
