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

Commit 4ed20beb authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: remove "channel" from survey names 



All of the survey data is (currently) per channel anyway,
so having the word "channel" in the name does nothing. In
the next patch I'll introduce global data to the survey,
where the word "channel" is actually confusing.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent db12847c

drivers/net/wireless/ath/ath10k/wmi.c

+4 −4
Original line number Diff line number Diff line
@@ -1344,11 +1344,11 @@ static void ath10k_wmi_event_chan_info(struct ath10k *ar, struct sk_buff *skb) 
		rx_clear_count -= ar->survey_last_rx_clear_count;



		survey = &ar->survey[idx];

		survey->channel_time = WMI_CHAN_INFO_MSEC(cycle_count);

		survey->channel_time_rx = WMI_CHAN_INFO_MSEC(rx_clear_count);

		survey->time = WMI_CHAN_INFO_MSEC(cycle_count);

		survey->time_rx = WMI_CHAN_INFO_MSEC(rx_clear_count);

		survey->noise = noise_floor;

		survey->filled = SURVEY_INFO_CHANNEL_TIME |

				 SURVEY_INFO_CHANNEL_TIME_RX |

		survey->filled = SURVEY_INFO_TIME |

				 SURVEY_INFO_TIME_RX |

				 SURVEY_INFO_NOISE_DBM;

	}

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+8 −8
Original line number Diff line number Diff line
@@ -672,10 +672,10 @@ ath5k_get_survey(struct ieee80211_hw *hw, int idx, struct survey_info *survey) 
	spin_lock_bh(&common->cc_lock);

	ath_hw_cycle_counters_update(common);

	if (cc->cycles > 0) {

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

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

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

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

		ah->survey.time += cc->cycles / div;

		ah->survey.time_busy += cc->rx_busy / div;

		ah->survey.time_rx += cc->rx_frame / div;

		ah->survey.time_tx += cc->tx_frame / div;

	}

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

	spin_unlock_bh(&common->cc_lock);
@@ -686,10 +686,10 @@ ath5k_get_survey(struct ieee80211_hw *hw, int idx, struct survey_info *survey) 
	survey->noise = ah->ah_noise_floor;

	survey->filled = SURVEY_INFO_NOISE_DBM |

			SURVEY_INFO_IN_USE |

			SURVEY_INFO_CHANNEL_TIME |

			SURVEY_INFO_CHANNEL_TIME_BUSY |

			SURVEY_INFO_CHANNEL_TIME_RX |

			SURVEY_INFO_CHANNEL_TIME_TX;

			SURVEY_INFO_TIME |

			SURVEY_INFO_TIME_BUSY |

			SURVEY_INFO_TIME_RX |

			SURVEY_INFO_TIME_TX;



	return 0;

}

drivers/net/wireless/ath/ath9k/link.c

+8 −8
Original line number Diff line number Diff line
@@ -516,14 +516,14 @@ int ath_update_survey_stats(struct ath_softc *sc) 
		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;

		survey->filled |= SURVEY_INFO_TIME |

			SURVEY_INFO_TIME_BUSY |

			SURVEY_INFO_TIME_RX |

			SURVEY_INFO_TIME_TX;

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

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

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

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

	}



	if (cc->cycles < div)

drivers/net/wireless/ath/carl9170/cmd.c

+6 −6
Original line number Diff line number Diff line
@@ -188,12 +188,12 @@ int carl9170_collect_tally(struct ar9170 *ar) 


		if (ar->channel) {

			info = &ar->survey[ar->channel->hw_value];

			info->channel_time = ar->tally.active;

			info->channel_time_busy = ar->tally.cca;

			info->channel_time_tx = ar->tally.tx_time;

			do_div(info->channel_time, 1000);

			do_div(info->channel_time_busy, 1000);

			do_div(info->channel_time_tx, 1000);

			info->time = ar->tally.active;

			info->time_busy = ar->tally.cca;

			info->time_tx = ar->tally.tx_time;

			do_div(info->time, 1000);

			do_div(info->time_busy, 1000);

			do_div(info->time_tx, 1000);

		}

	}

	return 0;

drivers/net/wireless/ath/carl9170/main.c

+3 −3
Original line number Diff line number Diff line
@@ -1690,9 +1690,9 @@ static int carl9170_op_get_survey(struct ieee80211_hw *hw, int idx, 
		survey->filled |= SURVEY_INFO_IN_USE;



	if (ar->fw.hw_counters) {

		survey->filled |= SURVEY_INFO_CHANNEL_TIME |

				  SURVEY_INFO_CHANNEL_TIME_BUSY |

				  SURVEY_INFO_CHANNEL_TIME_TX;

		survey->filled |= SURVEY_INFO_TIME |

				  SURVEY_INFO_TIME_BUSY |

				  SURVEY_INFO_TIME_TX;

	}



	return 0;