diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-27 05:17:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-27 05:17:35 +0200 |
| commit | 745bd6f44cd3413f429ed3e2c7744c8abf8630d5 (patch) | |
| tree | 29ccc5ac8cb3faca99f132e85fcb0b382e7cdcb1 /net/mac80211/rc80211_minstrel_ht.c | |
| parent | Merge branch 'net-phy-mscc-miim-reduce-waiting-time-between-MDIO-transactions' (diff) | |
| parent | mac80211: fix memory overlap due to variable length param (diff) | |
| download | linux-745bd6f44cd3413f429ed3e2c7744c8abf8630d5.tar.xz linux-745bd6f44cd3413f429ed3e2c7744c8abf8630d5.zip | |
Merge tag 'mac80211-next-for-net-next-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
One batch of changes, containing:
* hwsim improvements from Jouni and myself, to be able to
test more scenarios easily
* some more HE (802.11ax) support
* some initial S1G (sub 1 GHz) work for fractional MHz channels
* some (action) frame registration updates to help DPP support
* along with other various improvements/fixes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/rc80211_minstrel_ht.c')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 5dc3e5bc4e64..b11a2af55b06 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2010-2013 Felix Fietkau <nbd@openwrt.org> + * Copyright (C) 2019-2020 Intel Corporation */ #include <linux/netdevice.h> #include <linux/types.h> @@ -490,7 +491,7 @@ minstrel_ht_assign_best_tp_rates(struct minstrel_ht_sta *mi, tmp_prob = mi->groups[tmp_group].rates[tmp_idx].prob_avg; tmp_mcs_tp = minstrel_ht_get_tp_avg(mi, tmp_group, tmp_idx, tmp_prob); - if (tmp_cck_tp_rate && tmp_cck_tp > tmp_mcs_tp) { + if (tmp_cck_tp > tmp_mcs_tp) { for(i = 0; i < MAX_THR_RATES; i++) { minstrel_ht_sort_best_tp_rates(mi, tmp_cck_tp_rate[i], tmp_mcs_tp_rate); |