Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edb40a23 authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

ath5k: Add channel time to survey data 



Include the channel utilization (busy, rx, tx) in the survey results.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3dd0923d

drivers/net/wireless/ath/ath5k/base.c

+19 −1
Original line number Original line Diff line number Diff line
@@ -3206,6 +3206,9 @@ static int ath5k_get_survey(struct ieee80211_hw *hw, int idx, 
{

{

	struct ath5k_softc *sc = hw->priv;

	struct ath5k_softc *sc = hw->priv;

	struct ieee80211_conf *conf = &hw->conf;

	struct ieee80211_conf *conf = &hw->conf;

	struct ath_common *common = ath5k_hw_common(sc->ah);

	struct ath_cycle_counters *cc = &common->cc_survey;

	unsigned int div = common->clockrate * 1000;





	if (idx != 0)

	if (idx != 0)

		return -ENOENT;

		return -ENOENT;
@@ -3214,6 +3217,21 @@ static int ath5k_get_survey(struct ieee80211_hw *hw, int idx, 
	survey->filled = SURVEY_INFO_NOISE_DBM;

	survey->filled = SURVEY_INFO_NOISE_DBM;

	survey->noise = sc->ah->ah_noise_floor;

	survey->noise = sc->ah->ah_noise_floor;





	spin_lock_bh(&common->cc_lock);

	ath_hw_cycle_counters_update(common);

	if (cc->cycles > 0) {

		survey->filled |= SURVEY_INFO_CHANNEL_TIME |

			SURVEY_INFO_CHANNEL_TIME_BUSY |

			SURVEY_INFO_CHANNEL_TIME_RX |

			SURVEY_INFO_CHANNEL_TIME_TX;

		survey->channel_time += cc->cycles / div;

		survey->channel_time_busy += cc->rx_busy / div;

		survey->channel_time_rx += cc->rx_frame / div;

		survey->channel_time_tx += cc->tx_frame / div;

	}

	memset(cc, 0, sizeof(*cc));

	spin_unlock_bh(&common->cc_lock);



	return 0;

	return 0;

}

}