openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath9k: fix roadkill due to Joe's patch on ath_dbg() changes 

Joe changed ath_dbg() to simpify code but while his patch was
being merged dfs.c was born and as such did not get the change
Joe envisioned. This fixes that. Test compiled with:

 make allmodconfig

Cc: Joe Perches <joe@perches.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: John W. Linville <linville@tuxdriver.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez 2011-12-19 19:30:43 -08:00 committed by John W. Linville
parent 106671369e
commit ec9a570547
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/ath/ath9k/dfs.c
View File

@ -66,7 +66,7 @@ ath9k_postprocess_radar_event(struct ath_softc *sc,
u8 rssi; u8 rssi;
u16 dur; u16 dur;
ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_DFS, ath_dbg(ath9k_hw_common(sc->sc_ah), DFS,
"pulse_bw_info=0x%x, pri,ext len/rssi=(%u/%u, %u/%u)\n", "pulse_bw_info=0x%x, pri,ext len/rssi=(%u/%u, %u/%u)\n",
are->pulse_bw_info, are->pulse_bw_info,
are->pulse_length_pri, are->rssi, are->pulse_length_pri, are->rssi,
@ -161,7 +161,7 @@ void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
if ((!(rs->rs_phyerr != ATH9K_PHYERR_RADAR)) && if ((!(rs->rs_phyerr != ATH9K_PHYERR_RADAR)) &&
(!(rs->rs_phyerr != ATH9K_PHYERR_FALSE_RADAR_EXT))) { (!(rs->rs_phyerr != ATH9K_PHYERR_FALSE_RADAR_EXT))) {
ath_dbg(common, ATH_DBG_DFS, ath_dbg(common, DFS,
"Error: rs_phyer=0x%x not a radar error\n", "Error: rs_phyer=0x%x not a radar error\n",
rs->rs_phyerr); rs->rs_phyerr);
return; return;
@ -190,7 +190,7 @@ void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
ard.pulse_length_ext = vdata_end[-2]; ard.pulse_length_ext = vdata_end[-2];
ard.pulse_length_pri = vdata_end[-3]; ard.pulse_length_pri = vdata_end[-3];
ath_dbg(common, ATH_DBG_DFS, ath_dbg(common, DFS,
"bw_info=%d, length_pri=%d, length_ext=%d, " "bw_info=%d, length_pri=%d, length_ext=%d, "
"rssi_pri=%d, rssi_ext=%d\n", "rssi_pri=%d, rssi_ext=%d\n",
ard.pulse_bw_info, ard.pulse_length_pri, ard.pulse_length_ext, ard.pulse_bw_info, ard.pulse_length_pri, ard.pulse_length_ext,
@ -200,7 +200,7 @@ void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
drp.ts = mactime; drp.ts = mactime;
if (ath9k_postprocess_radar_event(sc, &ard, &drp)) { if (ath9k_postprocess_radar_event(sc, &ard, &drp)) {
static u64 last_ts; static u64 last_ts;
ath_dbg(common, ATH_DBG_DFS, ath_dbg(common, DFS,
"ath9k_dfs_process_phyerr: channel=%d, ts=%llu, " "ath9k_dfs_process_phyerr: channel=%d, ts=%llu, "
"width=%d, rssi=%d, delta_ts=%llu\n", "width=%d, rssi=%d, delta_ts=%llu\n",
drp.freq, drp.ts, drp.width, drp.rssi, drp.ts-last_ts); drp.freq, drp.ts, drp.width, drp.rssi, drp.ts-last_ts);