diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-07-08 14:45:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-07-08 14:45:34 +0200 |
| commit | 3c53c6255d598db7084c5c3d7553d7200e857818 (patch) | |
| tree | 19a88468bd59118ac7f07ce730485211ca671ea5 /net/wireless/util.c | |
| parent | b89b889a326a7abf1c9ceef7ddbe06dbaf8c2520 (diff) | |
| parent | a98429acadefc2b36611220f51659ecb3c1f35d2 (diff) | |
| download | talos-op-linux-3c53c6255d598db7084c5c3d7553d7200e857818.tar.gz talos-op-linux-3c53c6255d598db7084c5c3d7553d7200e857818.zip | |
Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v5.3
This is a very big update, mainly thanks to Morimoto-san's refactoring
work and some fairly large new drivers.
- Lots more work on moving towards a component based framework from
Morimoto-san.
- Support for force disconnecting muxes from Jerome Brunet.
- New drivers for Cirrus Logic CS47L35, CS47L85 and CS47L90, Conexant
CX2072X, Realtek RT1011 and RT1308.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index cf63b635afc0..1c39d6a2e850 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1246,7 +1246,7 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate) if (rate->he_dcm) result /= 2; - return result; + return result / 10000; } u32 cfg80211_calculate_bitrate(struct rate_info *rate) @@ -1998,7 +1998,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap, continue; if (supp >= mcs_encoding) { - max_vht_nss = i; + max_vht_nss = i + 1; break; } } |
