aboutsummaryrefslogtreecommitdiff
path: root/net/x25/Makefile
diff options
context:
space:
mode:
authorBenjamin Berg2023-06-16 09:54:03 +0300
committerGreg Kroah-Hartman2023-07-19 16:21:09 +0200
commit0862669693cf3b4fd9562cfa4d929074ce373716 (patch)
tree8b7394d1ed2055d891a6fab4a371023e88d2ed5b /net/x25/Makefile
parentd875120c3520e7041feb080ceaec7d5035335b7c (diff)
wifi: cfg80211: rewrite merging of inherited elements
[ Upstream commit dfd9aa3e7a456d57b18021d66472ab7ff8373ab7 ] The cfg80211_gen_new_ie function merges the IEs using inheritance rules. Rewrite this function to fix issues around inheritance rules. In particular, vendor elements do not require any special handling, as they are either all inherited or overridden by the subprofile. Also, add fragmentation handling as this may be needed in some cases. This also changes the function to not require making a copy. The new version could be optimized a bit by explicitly tracking which IEs have been handled already rather than looking that up again every time. Note that a small behavioural change is the removal of the SSID special handling. This should be fine for the MBSSID element, as the SSID must be included in the subelement. Fixes: 0b8fb8235be8 ("cfg80211: Parsing of Multiple BSSID information in scanning") Signed-off-by: Benjamin Berg <benjamin.berg@intel.com> Signed-off-by: Gregory Greenman <gregory.greenman@intel.com> Link: https://lore.kernel.org/r/20230616094949.bc6152e146db.I2b5f3bc45085e1901e5b5192a674436adaf94748@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/x25/Makefile')
0 files changed, 0 insertions, 0 deletions