diff options
| author | Kalle Valo <kvalo@kernel.org> | 2022-06-15 15:57:20 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2022-06-15 15:57:20 +0300 |
| commit | 8092a0eed4080a33a4c8681f4231c40c0bb7cb5c (patch) | |
| tree | ad720d82d1b224b908b908585ed4ec469d54d038 /drivers/net/wireless/ath/ath9k | |
| parent | fbb89d02e33a8c8f522d75882f5f19c65b722b46 (diff) | |
| parent | cc2609eda6981d65b3b1c81e2807910d718b2b98 (diff) | |
| download | linux-8092a0eed4080a33a4c8681f4231c40c0bb7cb5c.tar.bz2 | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for v5.20. Major changes:
ath10k
* 802.3 frame format support
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/dfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c index acb9602aa464..11349218bc21 100644 --- a/drivers/net/wireless/ath/ath9k/dfs.c +++ b/drivers/net/wireless/ath/ath9k/dfs.c @@ -246,7 +246,7 @@ ath9k_postprocess_radar_event(struct ath_softc *sc, DFS_STAT_INC(sc, dc_phy_errors); /* when both are present use stronger one */ - rssi = (ard->rssi < ard->ext_rssi) ? ard->ext_rssi : ard->rssi; + rssi = max(ard->rssi, ard->ext_rssi); break; default: /* |