Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

minstrel_ht: Remove unused function parameters

Remove unused function parameters in the following functions:
minstrel_calc_rate_ewma()
minstrel_ht_calc_tp()
minstrel_aggr_check()
minstrel_ht_set_rate()

Signed-off-by: Patrick Kelle <patrick.kelle81@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Patrick Kelle and committed by
John W. Linville
6048d763 88d53465

+12 -14
+12 -14
net/mac80211/rc80211_minstrel_ht.c
··· 130 130 * Recalculate success probabilities and counters for a rate using EWMA 131 131 */ 132 132 static void 133 - minstrel_calc_rate_ewma(struct minstrel_priv *mp, struct minstrel_rate_stats *mr) 133 + minstrel_calc_rate_ewma(struct minstrel_rate_stats *mr) 134 134 { 135 135 if (unlikely(mr->attempts > 0)) { 136 136 mr->sample_skipped = 0; ··· 156 156 * the expected number of retransmissions and their expected length 157 157 */ 158 158 static void 159 - minstrel_ht_calc_tp(struct minstrel_priv *mp, struct minstrel_ht_sta *mi, 160 - int group, int rate) 159 + minstrel_ht_calc_tp(struct minstrel_ht_sta *mi, int group, int rate) 161 160 { 162 161 struct minstrel_rate_stats *mr; 163 162 unsigned int usecs; ··· 225 226 mr = &mg->rates[i]; 226 227 mr->retry_updated = false; 227 228 index = MCS_GROUP_RATES * group + i; 228 - minstrel_calc_rate_ewma(mp, mr); 229 - minstrel_ht_calc_tp(mp, mi, group, i); 229 + minstrel_calc_rate_ewma(mr); 230 + minstrel_ht_calc_tp(mi, group, i); 230 231 231 232 if (!mr->cur_tp) 232 233 continue; ··· 356 357 } 357 358 358 359 static void 359 - minstrel_aggr_check(struct minstrel_priv *mp, struct ieee80211_sta *pubsta, struct sk_buff *skb) 360 + minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb) 360 361 { 361 362 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; 362 363 struct sta_info *sta = container_of(pubsta, struct sta_info, sta); ··· 454 455 if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000)) { 455 456 minstrel_ht_update_stats(mp, mi); 456 457 if (!(info->flags & IEEE80211_TX_CTL_AMPDU)) 457 - minstrel_aggr_check(mp, sta, skb); 458 + minstrel_aggr_check(sta, skb); 458 459 } 459 460 } 460 461 ··· 514 515 static void 515 516 minstrel_ht_set_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi, 516 517 struct ieee80211_tx_rate *rate, int index, 517 - struct ieee80211_tx_rate_control *txrc, 518 518 bool sample, bool rtscts) 519 519 { 520 520 const struct mcs_group *group = &minstrel_mcs_groups[index / MCS_GROUP_RATES]; ··· 626 628 if (sample_idx >= 0) { 627 629 sample = true; 628 630 minstrel_ht_set_rate(mp, mi, &ar[0], sample_idx, 629 - txrc, true, false); 631 + true, false); 630 632 info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE; 631 633 } else { 632 634 minstrel_ht_set_rate(mp, mi, &ar[0], mi->max_tp_rate, 633 - txrc, false, false); 635 + false, false); 634 636 } 635 637 636 638 if (mp->hw->max_rates >= 3) { ··· 641 643 */ 642 644 if (sample_idx >= 0) 643 645 minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_tp_rate, 644 - txrc, false, false); 646 + false, false); 645 647 else 646 648 minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_tp_rate2, 647 - txrc, false, true); 649 + false, true); 648 650 649 651 minstrel_ht_set_rate(mp, mi, &ar[2], mi->max_prob_rate, 650 - txrc, false, !sample); 652 + false, !sample); 651 653 652 654 ar[3].count = 0; 653 655 ar[3].idx = -1; ··· 658 660 * max_tp_rate -> max_prob_rate by default. 659 661 */ 660 662 minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_prob_rate, 661 - txrc, false, !sample); 663 + false, !sample); 662 664 663 665 ar[2].count = 0; 664 666 ar[2].idx = -1;