From 197afcc6b1140153df037240927bbded235f51e6 Mon Sep 17 00:00:00 2001 From: Ivo van Doorn Date: Sun, 1 Mar 2009 17:42:00 +0100 Subject: [PATCH] --- yaml --- r: 135076 b: refs/heads/master c: 64abd80330baba9d87df2b952a7eec5af5158470 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/net/wireless/rt2x00/rt2x00link.c | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e2f33463d78d..db4c81ef264f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14d2aac580993ac8faeac0d903207e316c0881c3 +refs/heads/master: 64abd80330baba9d87df2b952a7eec5af5158470 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00link.c b/trunk/drivers/net/wireless/rt2x00/rt2x00link.c index 9223a6d1f1d0..7eb5cd7e5f32 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00link.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00link.c @@ -302,11 +302,6 @@ static void rt2x00link_precalculate_signal(struct rt2x00_dev *rt2x00dev) PERCENTAGE(qual->rx_success, qual->rx_failed + qual->rx_success); link->tx_percentage = PERCENTAGE(qual->tx_success, qual->tx_failed + qual->tx_success); - - qual->rx_success = 0; - qual->rx_failed = 0; - qual->tx_success = 0; - qual->tx_failed = 0; } int rt2x00link_calculate_signal(struct rt2x00_dev *rt2x00dev, int rssi) @@ -392,6 +387,16 @@ void rt2x00link_reset_tuner(struct rt2x00_dev *rt2x00dev, bool antenna) rt2x00link_antenna_reset(rt2x00dev); } +void rt2x00link_reset_qual(struct rt2x00_dev *rt2x00dev) +{ + struct link_qual *qual = &rt2x00dev->link.qual; + + qual->rx_success = 0; + qual->rx_failed = 0; + qual->tx_success = 0; + qual->tx_failed = 0; +} + static void rt2x00link_tuner(struct work_struct *work) { struct rt2x00_dev *rt2x00dev = @@ -447,6 +452,11 @@ static void rt2x00link_tuner(struct work_struct *work) */ rt2x00lib_antenna_diversity(rt2x00dev); + /* + * Reset the quality counters which recounted during each period. + */ + rt2x00link_reset_qual(rt2x00dev); + /* * Increase tuner counter, and reschedule the next link tuner run. */