Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7660f95 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

mac80211: fix lookup when adding AddBA extension element 



[ 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: 2ab45876 ("mac80211: add support for the ADDBA extension element")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211129152938.010fc1d61137.If3a468145f29d670cb00a693bed559d8290ba693@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f363af7c

net/mac80211/agg-rx.c

+3 −2
Original line number Diff line number Diff line
@@ -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;