* [PATCH v4 1/2] cfg80211: expose cfg80211_calculate_bitrate() @ 2012-03-05 23:31 Thomas Pedersen 2012-03-05 23:31 ` [PATCH v4 2/2] mac80211: fix mesh airtime link metric estimating Thomas Pedersen 2012-03-06 8:29 ` [PATCH v4 1/2] cfg80211: expose cfg80211_calculate_bitrate() Johannes Berg 0 siblings, 2 replies; 4+ messages in thread From: Thomas Pedersen @ 2012-03-05 23:31 UTC (permalink / raw) To: linux-wireless; +Cc: devel, Thomas Pedersen, johannes, linville 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v4 2/2] mac80211: fix mesh airtime link metric estimating 2012-03-05 23:31 [PATCH v4 1/2] cfg80211: expose cfg80211_calculate_bitrate() Thomas Pedersen @ 2012-03-05 23:31 ` Thomas Pedersen 2012-03-06 8:30 ` Johannes Berg 2012-03-06 8:29 ` [PATCH v4 1/2] cfg80211: expose cfg80211_calculate_bitrate() Johannes Berg 1 sibling, 1 reply; 4+ messages in thread From: Thomas Pedersen @ 2012-03-05 23:31 UTC (permalink / raw) To: linux-wireless; +Cc: devel, Thomas Pedersen, johannes, linville Airtime link metric estimation was broken in HT mesh, use cfg80211_calculate_bitrate to get the right rate value. Also factor out tx rate copying from sta_set_sinfo(). Signed-off-by: Thomas Pedersen <thomas@cozybit.com> --- v2: factor out rate copying (Johannes) v3: just factor out tx rate copying (Johannes) v4: pass by reference and add "_tx" (Johannes) net/mac80211/cfg.c | 23 +++++++++++++++-------- net/mac80211/mesh_hwmp.c | 6 ++++-- net/mac80211/sta_info.h | 3 +++ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 6a77d4c..f6aacd8 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -336,6 +336,20 @@ static void rate_idx_to_bitrate(struct rate_info *rate, struct sta_info *sta, in rate->mcs = idx; } +void sta_set_rate_info_tx(struct sta_info *sta, + const struct ieee80211_tx_rate *rate, + struct rate_info *rinfo) +{ + rinfo->flags = 0; + if (rate->flags & IEEE80211_TX_RC_MCS) + rinfo->flags |= RATE_INFO_FLAGS_MCS; + if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH) + rinfo->flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH; + if (rate->flags & IEEE80211_TX_RC_SHORT_GI) + rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI; + rate_idx_to_bitrate(rinfo, sta, rate->idx); +} + static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) { struct ieee80211_sub_if_data *sdata = sta->sdata; @@ -378,14 +392,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); + sta_set_rate_info_tx(sta, &sta->last_tx_rate, &sinfo->txrate); sinfo->rxrate.flags = 0; if (sta->last_rx_rate_flag & RX_FLAG_HT) diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 31bc762..13a4cb8 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 rate_info rinfo; /* 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_tx(sta, &sta->last_tx_rate, &rinfo); + rate = cfg80211_calculate_bitrate(&rinfo); + 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..92715c6 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -528,6 +528,9 @@ 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_tx(struct sta_info *sta, + const struct ieee80211_tx_rate *rate, + struct rate_info *rinfo); void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata, unsigned long exp_time); -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v4 2/2] mac80211: fix mesh airtime link metric estimating 2012-03-05 23:31 ` [PATCH v4 2/2] mac80211: fix mesh airtime link metric estimating Thomas Pedersen @ 2012-03-06 8:30 ` Johannes Berg 0 siblings, 0 replies; 4+ messages in thread From: Johannes Berg @ 2012-03-06 8:30 UTC (permalink / raw) To: Thomas Pedersen; +Cc: linux-wireless, devel, linville On Mon, 2012-03-05 at 15:31 -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 tx rate copying from sta_set_sinfo(). > > Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Reviewed-by: Johannes Berg <johannes@sipsolutions.net> > > --- > v2: > factor out rate copying (Johannes) > > v3: > just factor out tx rate copying (Johannes) > > v4: > pass by reference and add "_tx" (Johannes) > > net/mac80211/cfg.c | 23 +++++++++++++++-------- > net/mac80211/mesh_hwmp.c | 6 ++++-- > net/mac80211/sta_info.h | 3 +++ > 3 files changed, 22 insertions(+), 10 deletions(-) > > diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c > index 6a77d4c..f6aacd8 100644 > --- a/net/mac80211/cfg.c > +++ b/net/mac80211/cfg.c > @@ -336,6 +336,20 @@ static void rate_idx_to_bitrate(struct rate_info *rate, struct sta_info *sta, in > rate->mcs = idx; > } > > +void sta_set_rate_info_tx(struct sta_info *sta, > + const struct ieee80211_tx_rate *rate, > + struct rate_info *rinfo) > +{ > + rinfo->flags = 0; > + if (rate->flags & IEEE80211_TX_RC_MCS) > + rinfo->flags |= RATE_INFO_FLAGS_MCS; > + if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH) > + rinfo->flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH; > + if (rate->flags & IEEE80211_TX_RC_SHORT_GI) > + rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI; > + rate_idx_to_bitrate(rinfo, sta, rate->idx); > +} > + > static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) > { > struct ieee80211_sub_if_data *sdata = sta->sdata; > @@ -378,14 +392,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); > + sta_set_rate_info_tx(sta, &sta->last_tx_rate, &sinfo->txrate); > > sinfo->rxrate.flags = 0; > if (sta->last_rx_rate_flag & RX_FLAG_HT) > diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c > index 31bc762..13a4cb8 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 rate_info rinfo; > /* 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_tx(sta, &sta->last_tx_rate, &rinfo); > + rate = cfg80211_calculate_bitrate(&rinfo); > + 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..92715c6 100644 > --- a/net/mac80211/sta_info.h > +++ b/net/mac80211/sta_info.h > @@ -528,6 +528,9 @@ 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_tx(struct sta_info *sta, > + const struct ieee80211_tx_rate *rate, > + struct rate_info *rinfo); > void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata, > unsigned long exp_time); > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v4 1/2] cfg80211: expose cfg80211_calculate_bitrate() 2012-03-05 23:31 [PATCH v4 1/2] cfg80211: expose cfg80211_calculate_bitrate() Thomas Pedersen 2012-03-05 23:31 ` [PATCH v4 2/2] mac80211: fix mesh airtime link metric estimating Thomas Pedersen @ 2012-03-06 8:29 ` Johannes Berg 1 sibling, 0 replies; 4+ messages in thread From: Johannes Berg @ 2012-03-06 8:29 UTC (permalink / raw) To: Thomas Pedersen; +Cc: linux-wireless, devel, linville On Mon, 2012-03-05 at 15:31 -0800, Thomas Pedersen wrote: > Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Reviewed-by: Johannes Berg <johannes@sipsolutions.net> > --- > 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) ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-06 8:30 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-03-05 23:31 [PATCH v4 1/2] cfg80211: expose cfg80211_calculate_bitrate() Thomas Pedersen 2012-03-05 23:31 ` [PATCH v4 2/2] mac80211: fix mesh airtime link metric estimating Thomas Pedersen 2012-03-06 8:30 ` Johannes Berg 2012-03-06 8:29 ` [PATCH v4 1/2] cfg80211: expose cfg80211_calculate_bitrate() Johannes Berg
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).