[PATCH v2 1/2] cfg80211: expose cfg80211_calculate_bitrate()

[PATCH v2 1/2] cfg80211: expose cfg80211_calculate_bitrate()

[Thomas Pedersen]

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
---
 include/net/cfg80211.h |    8 ++++++++
 net/wireless/util.c    |    1 +
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 0178c74..64f6181 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -3334,6 +3334,14 @@ int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
 				 struct ieee80211_channel *chan,
 				 enum nl80211_channel_type channel_type);
 
+/*
+ * cfg80211_calculate_bitrate - calculate actual bitrate (in 100Kbps units)
+ * @rate: given rate_info to calculate bitrate from
+ *
+ * return 0 if MCS index >= 32
+ */
+u16 cfg80211_calculate_bitrate(struct rate_info *rate);
+
 /* Logging, debugging and troubleshooting/diagnostic helpers. */
 
 /* wiphy_printk helpers, similar to dev_printk */
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 9aa9db6..1b7a08d 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -904,6 +904,7 @@ u16 cfg80211_calculate_bitrate(struct rate_info *rate)
 	/* do NOT round down here */
 	return (bitrate + 50000) / 100000;
 }
+EXPORT_SYMBOL(cfg80211_calculate_bitrate);
 
 int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev,
 				 u32 beacon_int)
-- 
1.7.5.4

[PATCH v2 2/2] mac80211: fix mesh airtime link metric estimating

[Thomas Pedersen]

Airtime link metric estimation was broken in HT mesh, use
cfg80211_calculate_bitrate to get the right rate value.

Also factor out rate copying from sta_set_sinfo().

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
---
v2:
factor out rate copying (Johannes)

 net/mac80211/cfg.c       |   39 ++++++++++++++++++++++-----------------
 net/mac80211/mesh_hwmp.c |    6 ++++--
 net/mac80211/sta_info.h  |    1 +
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 6a77d4c..ddef553 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -336,6 +336,27 @@ static void rate_idx_to_bitrate(struct rate_info *rate, struct sta_info *sta, in
 		rate->mcs = idx;
 }
 
+void sta_set_rate_info(struct sta_info *sta, struct station_info *sinfo)
+{
+	sinfo->txrate.flags = 0;
+	if (sta->last_tx_rate.flags & IEEE80211_TX_RC_MCS)
+		sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS;
+	if (sta->last_tx_rate.flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
+		sinfo->txrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
+	if (sta->last_tx_rate.flags & IEEE80211_TX_RC_SHORT_GI)
+		sinfo->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
+	rate_idx_to_bitrate(&sinfo->txrate, sta, sta->last_tx_rate.idx);
+
+	sinfo->rxrate.flags = 0;
+	if (sta->last_rx_rate_flag & RX_FLAG_HT)
+		sinfo->rxrate.flags |= RATE_INFO_FLAGS_MCS;
+	if (sta->last_rx_rate_flag & RX_FLAG_40MHZ)
+		sinfo->rxrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
+	if (sta->last_rx_rate_flag & RX_FLAG_SHORT_GI)
+		sinfo->rxrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
+	rate_idx_to_bitrate(&sinfo->rxrate, sta, sta->last_rx_rate_idx);
+}
+
 static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
 {
 	struct ieee80211_sub_if_data *sdata = sta->sdata;
@@ -378,23 +399,7 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
 		sinfo->signal_avg = (s8) -ewma_read(&sta->avg_signal);
 	}
 
-	sinfo->txrate.flags = 0;
-	if (sta->last_tx_rate.flags & IEEE80211_TX_RC_MCS)
-		sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS;
-	if (sta->last_tx_rate.flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-		sinfo->txrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
-	if (sta->last_tx_rate.flags & IEEE80211_TX_RC_SHORT_GI)
-		sinfo->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
-	rate_idx_to_bitrate(&sinfo->txrate, sta, sta->last_tx_rate.idx);
-
-	sinfo->rxrate.flags = 0;
-	if (sta->last_rx_rate_flag & RX_FLAG_HT)
-		sinfo->rxrate.flags |= RATE_INFO_FLAGS_MCS;
-	if (sta->last_rx_rate_flag & RX_FLAG_40MHZ)
-		sinfo->rxrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
-	if (sta->last_rx_rate_flag & RX_FLAG_SHORT_GI)
-		sinfo->rxrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
-	rate_idx_to_bitrate(&sinfo->rxrate, sta, sta->last_rx_rate_idx);
+	sta_set_rate_info(sta, sinfo);
 
 	if (ieee80211_vif_is_mesh(&sdata->vif)) {
 #ifdef CONFIG_MAC80211_MESH
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 31bc762..5ea6f49 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -323,6 +323,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
 				   struct sta_info *sta)
 {
 	struct ieee80211_supported_band *sband;
+	struct station_info sinfo;
 	/* This should be adjusted for each device */
 	int device_constant = 1 << ARITH_SHIFT;
 	int test_frame_len = TEST_FRAME_LEN << ARITH_SHIFT;
@@ -336,7 +337,9 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
 	if (sta->fail_avg >= 100)
 		return MAX_METRIC;
 
-	if (sta->last_tx_rate.flags & IEEE80211_TX_RC_MCS)
+	sta_set_rate_info(sta, &sinfo);
+	rate = cfg80211_calculate_bitrate(&sinfo.txrate);
+	if (WARN_ON(!rate))
 		return MAX_METRIC;
 
 	err = (sta->fail_avg << ARITH_SHIFT) / 100;
@@ -344,7 +347,6 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
 	/* bitrate is in units of 100 Kbps, while we need rate in units of
 	 * 1Mbps. This will be corrected on tx_time computation.
 	 */
-	rate = sband->bitrates[sta->last_tx_rate.idx].bitrate;
 	tx_time = (device_constant + 10 * test_frame_len / rate);
 	estimated_retx = ((1 << (2 * ARITH_SHIFT)) / (s_unit - err));
 	result = (tx_time * estimated_retx) >> (2 * ARITH_SHIFT) ;
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 23a97c9..a58b965 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -528,6 +528,7 @@ void sta_info_init(struct ieee80211_local *local);
 void sta_info_stop(struct ieee80211_local *local);
 int sta_info_flush(struct ieee80211_local *local,
 		   struct ieee80211_sub_if_data *sdata);
+void sta_set_rate_info(struct sta_info *sta, struct station_info *sinfo);
 void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
 			  unsigned long exp_time);
 
-- 
1.7.5.4

Re: [PATCH v2 2/2] mac80211: fix mesh airtime link metric estimating

[Johannes Berg]

On Fri, 2012-03-02 at 15:46 -0800, Thomas Pedersen wrote:
> Airtime link metric estimation was broken in HT mesh, use
> cfg80211_calculate_bitrate to get the right rate value.
> 
> Also factor out rate copying from sta_set_sinfo().
> 
> Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
> ---
> v2:
> factor out rate copying (Johannes)

> +void sta_set_rate_info(struct sta_info *sta, struct station_info *sinfo)

For stack usage, it'd be better if you gave this two arguments (struct
rate_info *txrate, struct rate_info *rxrate), or maybe simply factored
out *only* the TX-rate bit?

johannes

Re: [PATCH v2 2/2] mac80211: fix mesh airtime link metric estimating

[Thomas Pedersen]

grrr, missed reply-all.

On Sun, Mar 4, 2012 at 2:37 PM, Thomas Pedersen <thomas@cozybit.com> wrote:
> On Sat, Mar 3, 2012 at 3:37 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
>> On Fri, 2012-03-02 at 15:46 -0800, Thomas Pedersen wrote:
>>> Airtime link metric estimation was broken in HT mesh, use
>>> cfg80211_calculate_bitrate to get the right rate value.
>>>
>>> Also factor out rate copying from sta_set_sinfo().
>>>
>>> Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
>>> ---
>>> v2:
>>> factor out rate copying (Johannes)
>>
>>> +void sta_set_rate_info(struct sta_info *sta, struct station_info *sinfo)
>>
>> For stack usage, it'd be better if you gave this two arguments (struct
>> rate_info *txrate, struct rate_info *rxrate), or maybe simply factored
>> out *only* the TX-rate bit?
>>
>
> like sta_set_rate_info(struct sta_info *sta, struct rate_info *txrate,
> struct rate_info *rxrate)?
>
> How do you feel about consolidating last_rx_flags and _index into an
> ieee80211_tx_rate? A bit odd maybe, but then we could use:
>
> sta_set_rate_info(struct ieee80211_tx_rate *rate, struct rate_info *rinfo);
>
> As needed for both last_rx and last_tx rates.
>
> Thomas

Re: [PATCH v2 2/2] mac80211: fix mesh airtime link metric estimating

[Johannes Berg]

On Sun, 2012-03-04 at 14:49 -0800, Thomas Pedersen wrote:

> >> For stack usage, it'd be better if you gave this two arguments (struct
> >> rate_info *txrate, struct rate_info *rxrate), or maybe simply factored
> >> out *only* the TX-rate bit?
> >>
> >
> > like sta_set_rate_info(struct sta_info *sta, struct rate_info *txrate,
> > struct rate_info *rxrate)?
> >
> > How do you feel about consolidating last_rx_flags and _index into an
> > ieee80211_tx_rate? A bit odd maybe, but then we could use:
> >
> > sta_set_rate_info(struct ieee80211_tx_rate *rate, struct rate_info *rinfo);
> >
> > As needed for both last_rx and last_tx rates.

Seems a little odd to first translate RX rate into TX rate and then to
cfg80211 info? But you only care about TX rate anyway so ... why worry
at all?

johannes