diff options
author | Sara Sharon <sara.sharon@intel.com> | 2019-01-16 12:14:41 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2019-02-08 13:51:50 +0100 |
commit | 4abb52a46e7336c1e568a53761c8b7a81bbaaeaf (patch) | |
tree | ba154f2d70a786a6871dcd5af7ba2aa39ba45bab /net/mac80211/util.c | |
parent | 9f308616b6176b6dc470e6eb3569a09b100a823a (diff) | |
download | linux-stable-4abb52a46e7336c1e568a53761c8b7a81bbaaeaf.tar.gz linux-stable-4abb52a46e7336c1e568a53761c8b7a81bbaaeaf.tar.bz2 linux-stable-4abb52a46e7336c1e568a53761c8b7a81bbaaeaf.zip |
mac80211: pass bssids to elements parsing function
In multiple BSSID, we have nested IEs inside the multiple
BSSID IE, that override the external ones for that specific
BSS. As preparation for supporting that, pass 2 BSSIDs to the
parse function, the transmitter, and the selected BSSID, so
it can know which IEs to choose. If the selected BSSID is
NULL, the outer ones will be applied.
Change ieee80211_bss_info_update to parse elements itself,
instead of receiving them parsed, so we have the relevant
bss entry in hand.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 7fa9ba197c26..77882ca327de 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -893,7 +893,8 @@ EXPORT_SYMBOL(ieee80211_queue_delayed_work); u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, struct ieee802_11_elems *elems, - u64 filter, u32 crc) + u64 filter, u32 crc, u8 *transmitter_bssid, + u8 *bss_bssid) { struct element *elem; bool calc_crc = filter != 0; |