| From ab12c37a550b20033dc16927667d9c5d11ef0a1c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 29 Nov 2021 15:32:46 +0200 |
| Subject: mac80211: fix lookup when adding AddBA extension element |
| |
| From: Johannes Berg <johannes.berg@intel.com> |
| |
| [ Upstream commit 511ab0c1dfb260a6b17b8771109e8d63474473a7 ] |
| |
| We should be doing the HE capabilities lookup based on the full |
| interface type so if P2P doesn't have HE but client has it doesn't |
| get confused. Fix that. |
| |
| Fixes: 2ab45876756f ("mac80211: add support for the ADDBA extension element") |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Link: https://lore.kernel.org/r/iwlwifi.20211129152938.010fc1d61137.If3a468145f29d670cb00a693bed559d8290ba693@changeid |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/mac80211/agg-rx.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c |
| index cce28e3b22323..ef729b1e39ea3 100644 |
| --- a/net/mac80211/agg-rx.c |
| +++ b/net/mac80211/agg-rx.c |
| @@ -9,7 +9,7 @@ |
| * Copyright 2007, Michael Wu <flamingice@sourmilk.net> |
| * Copyright 2007-2010, Intel Corporation |
| * Copyright(c) 2015-2017 Intel Deutschland GmbH |
| - * Copyright (C) 2018-2020 Intel Corporation |
| + * Copyright (C) 2018-2021 Intel Corporation |
| */ |
| |
| /** |
| @@ -191,7 +191,8 @@ static void ieee80211_add_addbaext(struct ieee80211_sub_if_data *sdata, |
| sband = ieee80211_get_sband(sdata); |
| if (!sband) |
| return; |
| - he_cap = ieee80211_get_he_iftype_cap(sband, sdata->vif.type); |
| + he_cap = ieee80211_get_he_iftype_cap(sband, |
| + ieee80211_vif_type_p2p(&sdata->vif)); |
| if (!he_cap) |
| return; |
| |
| -- |
| 2.33.0 |
| |
