Merge ath-next from ath.git

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ath / dfs_pattern_detector.c

diff --git a/drivers/net/wireless/ath/dfs_pattern_detector.c b/drivers/net/wireless/ath/dfs_pattern_detector.c
index ea9d7c0efd7b23c013416a86711c68dc4f90806f..656ce42b339a50d3b8bf9644fd5386055b707950 100644 (file)
--- a/drivers/net/wireless/ath/dfs_pattern_detector.c
+++ b/drivers/net/wireless/ath/dfs_pattern_detector.c
@@ -305,7 +305,7 @@ dpd_add_pulse(struct dfs_pattern_detector *dpd, struct pulse_event *event)
                                "count=%d, count_false=%d\n",
                                event->freq, pd->rs->type_id,
                                ps->pri, ps->count, ps->count_falses);
-                       channel_detector_reset(dpd, cd);
+                       pd->reset(pd, dpd->last_pulse_ts);
                        return true;
                }
        }