diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-11-02 09:43:54 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-02 09:43:54 -0800 |
| commit | 04a55c944f151b3149b78beff5ff406faa84485d (patch) | |
| tree | 014f6b7e62ac639f43a3b75cb5daaab9d58a51f9 /net/wireless/reg.c | |
| parent | 859191b234f86b5f36cbe384baca1067a2221eb7 (diff) | |
| parent | c2f46814521113f6699a74e0a0424cbc5b305479 (diff) | |
| download | linux-04a55c944f151b3149b78beff5ff406faa84485d.tar.gz linux-04a55c944f151b3149b78beff5ff406faa84485d.tar.bz2 linux-04a55c944f151b3149b78beff5ff406faa84485d.zip | |
Merge tag 'mac80211-for-net-2020-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A couple of fixes, for
* HE on 2.4 GHz
* a few issues syzbot found, but we have many more reports :-(
* a regression in nl80211-transported EAPOL frames which had
affected a number of users, from Mathy
* kernel-doc markings in mac80211, from Mauro
* a format argument in reg.c, from Ye Bin
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 3dab859641e1..a04fdfb35f07 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -3616,7 +3616,7 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd) power_rule = ®_rule->power_rule; if (reg_rule->flags & NL80211_RRF_AUTO_BW) - snprintf(bw, sizeof(bw), "%d KHz, %d KHz AUTO", + snprintf(bw, sizeof(bw), "%d KHz, %u KHz AUTO", freq_range->max_bandwidth_khz, reg_get_max_bandwidth(rd, reg_rule)); else |