| Message ID | 1506419987-22995-1-git-send-email-sgruszka@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johannes Berg |
| Headers | show |
On Tue, 2017-09-26 at 11:59 +0200, Stanislaw Gruszka wrote: > STA_SLOW_THRESHOLD is used only in one function, so don't need to be > global define. > > Patch also fixes problem of htmldocs build I encountered: > > Error(.//net/mac80211/sta_info.h:416): cannot understand prototype: > 'STA_SLOW_THRESHOLD 6000 ' Why not just change /** to /*? I think it's better to keep it there even if it's not used, it's a more public thing than the code? johannes
On Tue, Sep 26, 2017 at 12:18:14PM +0200, Johannes Berg wrote: > On Tue, 2017-09-26 at 11:59 +0200, Stanislaw Gruszka wrote: > > STA_SLOW_THRESHOLD is used only in one function, so don't need to be > > global define. > > > > Patch also fixes problem of htmldocs build I encountered: > > > > Error(.//net/mac80211/sta_info.h:416): cannot understand prototype: > > 'STA_SLOW_THRESHOLD 6000????' > > Why not just change /** to /*? I think it's better to keep it there > even if it's not used, it's a more public thing than the code? I thought local references are preferred over global. Fixing only comment is fine for me, I'll post v2. Stanislaw
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 6961501..b79c2d0 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2319,10 +2319,16 @@ unsigned long ieee80211_sta_last_active(struct sta_info *sta) static void sta_update_codel_params(struct sta_info *sta, u32 thr) { + /* The bandwidth threshold below which the per-station CoDel parameters + * will be scaled to be more lenient (to prevent starvation of slow + * stations). Value will be scaled by the number of active stations. + */ + const unsigned int slow_threshold = 6000; /* 6Mbps */ + if (!sta->sdata->local->ops->wake_tx_queue) return; - if (thr && thr < STA_SLOW_THRESHOLD * sta->local->num_sta) { + if (thr && thr < slow_threshold * sta->local->num_sta) { sta->cparams.target = MS2TIME(50); sta->cparams.interval = MS2TIME(300); sta->cparams.ecn = false; diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 3acbdfa..24eeab8 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -399,14 +399,6 @@ struct ieee80211_sta_rx_stats { }; /** - * The bandwidth threshold below which the per-station CoDel parameters will be - * scaled to be more lenient (to prevent starvation of slow stations). This - * value will be scaled by the number of active stations when it is being - * applied. - */ -#define STA_SLOW_THRESHOLD 6000 /* 6 Mbps */ - -/** * struct sta_info - STA information * * This structure collects information about a station that
STA_SLOW_THRESHOLD is used only in one function, so don't need to be global define. Patch also fixes problem of htmldocs build I encountered: Error(.//net/mac80211/sta_info.h:416): cannot understand prototype: 'STA_SLOW_THRESHOLD 6000 ' Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- net/mac80211/sta_info.c | 8 +++++++- net/mac80211/sta_info.h | 8 -------- 2 files changed, 7 insertions(+), 9 deletions(-)