]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
mac80211: fix warning in 6 GHz IE addition in mesh mode
authorRajkumar Manoharan <rmanohar@codeaurora.org>
Thu, 2 Jul 2020 02:20:24 +0000 (19:20 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 30 Jul 2020 08:20:37 +0000 (10:20 +0200)
commit65ad3ef9fced4062dfd74e2f89443fb5ce184321
tree6bcb8a0fe845bab3e7f6406a68e7afc34acd6bcd
parent27a2145d6f826d1fad9de06ac541b1016ced3427
mac80211: fix warning in 6 GHz IE addition in mesh mode

The commit 24a2042cb22f ("mac80211: add HE 6 GHz Band Capability
element") failed to check device capability before adding HE 6 GHz
capability element. Below warning is reported in 11ac device in mesh.
Fix that by checking device capability at HE 6 GHz cap IE addition
in mesh beacon and association request.

WARNING: CPU: 1 PID: 1897 at net/mac80211/util.c:2878
ieee80211_ie_build_he_6ghz_cap+0x149/0x150 [mac80211]
[ 3138.720358] Call Trace:
[ 3138.720361]  ieee80211_mesh_build_beacon+0x462/0x530 [mac80211]
[ 3138.720363]  ieee80211_start_mesh+0xa8/0xf0 [mac80211]
[ 3138.720365]  __cfg80211_join_mesh+0x122/0x3e0 [cfg80211]
[ 3138.720368]  nl80211_join_mesh+0x3d3/0x510 [cfg80211]

Fixes: 24a2042cb22f ("mac80211: add HE 6 GHz Band Capability element")
Reported-by: Markus Theil <markus.theil@tu-ilmenau.de>
Signed-off-by: Rajkumar Manoharan <rmanohar@codeaurora.org>
Link: https://lore.kernel.org/r/1593656424-18240-1-git-send-email-rmanohar@codeaurora.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mesh.c
net/mac80211/util.c