d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LinuxKPI: 802.11: implement some *eleme/ie* lookup functions

Browse Source 
Implement cfg80211_find_elem(), ieee80211_bss_get_elem(),
ieee80211_bss_get_ie(), and cfg80211_find_vendor_ie() with the last
one having a short cut always also checking oui_type in the pattern.

Sponsored by:	The FreeBSD Foundation
MFC after:	10 days
This commit is contained in:
Bjoern A. Zeeb 2022-12-31 01:33:28 +00:00
parent 5edde07c2a
commit 5db817d864
2 changed files with 65 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
sys/compat/linuxkpi/common/include/net/cfg80211.h
View File

@ -1321,13 +1321,75 @@ struct element {
uint8_t data[0];
} __packed;
static __inline const struct element *
cfg80211_find_elem(enum ieee80211_eid eid, uint8_t *data, size_t len)
static inline const struct element *
lkpi_cfg80211_find_elem_pattern(enum ieee80211_eid eid,
const uint8_t *data, size_t len, uint8_t *pattern, size_t plen)
{
TODO();
const struct element *elem;
const uint8_t *p;
size_t ielen;
p = data;
elem = (const struct element *)p;
ielen = len;
while (elem != NULL && ielen > 1) {
if ((2 + elem->datalen) > ielen)
/* Element overruns our memory. */
return (NULL);
if (elem->id == eid) {
if (pattern == NULL)
return (elem);
if (elem->datalen >= plen &&
memcmp(elem->data, pattern, plen) == 0)
return (elem);
}
ielen -= 2 + elem->datalen;
p += 2 + elem->datalen;
elem = (const struct element *)p;
}
return (NULL);
}
static inline const struct element *
cfg80211_find_elem(enum ieee80211_eid eid, const uint8_t *data, size_t len)
{
return (lkpi_cfg80211_find_elem_pattern(eid, data, len, NULL, 0));
}
static inline const struct element *
ieee80211_bss_get_elem(struct cfg80211_bss *bss, uint32_t eid)
{
if (bss->ies == NULL)
return (NULL);
return (cfg80211_find_elem(eid, bss->ies->data, bss->ies->len));
}
static inline const uint8_t *
ieee80211_bss_get_ie(struct cfg80211_bss *bss, uint32_t eid)
{
return ((const uint8_t *)ieee80211_bss_get_elem(bss, eid));
}
static inline uint8_t *
cfg80211_find_vendor_ie(unsigned int oui, int oui_type,
uint8_t *data, size_t len)
{
const struct element *elem;
uint8_t pattern[4] = { oui << 16, oui << 8, oui, oui_type };
uint8_t plen = 4; /* >= 3? oui_type always part of this? */
IMPROVE("plen currently always incl. oui_type");
elem = lkpi_cfg80211_find_elem_pattern(IEEE80211_ELEMID_VENDOR,
data, len, pattern, plen);
if (elem == NULL)
return (NULL);
return (__DECONST(uint8_t *, elem));
}
static __inline uint32_t
cfg80211_calculate_bitrate(struct rate_info *rate)
{
@ -1439,14 +1501,6 @@ wiphy_read_of_freq_limits(struct wiphy *wiphy)
#endif
}
static __inline uint8_t *
cfg80211_find_vendor_ie(unsigned int oui, u8 oui_type,
uint8_t *data, size_t len)
{
TODO();
return (NULL);
}
static __inline void
wiphy_ext_feature_set(struct wiphy *wiphy, enum nl80211_ext_feature ef)
{

14
sys/compat/linuxkpi/common/include/net/mac80211.h
View File

@ -2174,13 +2174,6 @@ SET_IEEE80211_PERM_ADDR (struct ieee80211_hw *hw, uint8_t *addr)
ether_addr_copy(hw->wiphy->perm_addr, addr);
}
static __inline uint8_t *
ieee80211_bss_get_ie(struct cfg80211_bss *bss, uint32_t eid)
{
TODO();
return (NULL);
}
static __inline void
ieee80211_report_low_ack(struct ieee80211_sta *sta, int x)
{
@ -2359,13 +2352,6 @@ ieee80211_tx_status_ext(struct ieee80211_hw *hw,
TODO();
}
static __inline const struct element *
ieee80211_bss_get_elem(struct cfg80211_bss *bss, uint32_t eid)
{
TODO();
return (NULL);
}
static __inline void
ieee80211_color_change_finish(struct ieee80211_vif *vif)
{