diff options
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index db9176d2d86..857b3287e04 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | |||
@@ -247,6 +247,13 @@ static const u32 __wl_cipher_suites[] = { | |||
247 | WLAN_CIPHER_SUITE_AES_CMAC, | 247 | WLAN_CIPHER_SUITE_AES_CMAC, |
248 | }; | 248 | }; |
249 | 249 | ||
250 | /* tag_ID/length/value_buffer tuple */ | ||
251 | struct brcmf_tlv { | ||
252 | u8 id; | ||
253 | u8 len; | ||
254 | u8 data[1]; | ||
255 | }; | ||
256 | |||
250 | /* Quarter dBm units to mW | 257 | /* Quarter dBm units to mW |
251 | * Table starts at QDBM_OFFSET, so the first entry is mW for qdBm=153 | 258 | * Table starts at QDBM_OFFSET, so the first entry is mW for qdBm=153 |
252 | * Table is offset so the last entry is largest mW value that fits in | 259 | * Table is offset so the last entry is largest mW value that fits in |
@@ -2151,11 +2158,39 @@ static bool brcmf_is_ibssmode(struct brcmf_cfg80211_priv *cfg_priv) | |||
2151 | return cfg_priv->conf->mode == WL_MODE_IBSS; | 2158 | return cfg_priv->conf->mode == WL_MODE_IBSS; |
2152 | } | 2159 | } |
2153 | 2160 | ||
2161 | /* | ||
2162 | * Traverse a string of 1-byte tag/1-byte length/variable-length value | ||
2163 | * triples, returning a pointer to the substring whose first element | ||
2164 | * matches tag | ||
2165 | */ | ||
2166 | static struct brcmf_tlv *brcmf_parse_tlvs(void *buf, int buflen, uint key) | ||
2167 | { | ||
2168 | struct brcmf_tlv *elt; | ||
2169 | int totlen; | ||
2170 | |||
2171 | elt = (struct brcmf_tlv *) buf; | ||
2172 | totlen = buflen; | ||
2173 | |||
2174 | /* find tagged parameter */ | ||
2175 | while (totlen >= 2) { | ||
2176 | int len = elt->len; | ||
2177 | |||
2178 | /* validate remaining totlen */ | ||
2179 | if ((elt->id == key) && (totlen >= (len + 2))) | ||
2180 | return elt; | ||
2181 | |||
2182 | elt = (struct brcmf_tlv *) ((u8 *) elt + (len + 2)); | ||
2183 | totlen -= (len + 2); | ||
2184 | } | ||
2185 | |||
2186 | return NULL; | ||
2187 | } | ||
2188 | |||
2154 | static s32 brcmf_update_bss_info(struct brcmf_cfg80211_priv *cfg_priv) | 2189 | static s32 brcmf_update_bss_info(struct brcmf_cfg80211_priv *cfg_priv) |
2155 | { | 2190 | { |
2156 | struct brcmf_bss_info *bi; | 2191 | struct brcmf_bss_info *bi; |
2157 | struct brcmf_ssid *ssid; | 2192 | struct brcmf_ssid *ssid; |
2158 | struct brcmu_tlv *tim; | 2193 | struct brcmf_tlv *tim; |
2159 | u16 beacon_interval; | 2194 | u16 beacon_interval; |
2160 | u8 dtim_period; | 2195 | u8 dtim_period; |
2161 | size_t ie_len; | 2196 | size_t ie_len; |
@@ -2185,7 +2220,7 @@ static s32 brcmf_update_bss_info(struct brcmf_cfg80211_priv *cfg_priv) | |||
2185 | ie_len = le32_to_cpu(bi->ie_length); | 2220 | ie_len = le32_to_cpu(bi->ie_length); |
2186 | beacon_interval = le16_to_cpu(bi->beacon_period); | 2221 | beacon_interval = le16_to_cpu(bi->beacon_period); |
2187 | 2222 | ||
2188 | tim = brcmu_parse_tlvs(ie, ie_len, WLAN_EID_TIM); | 2223 | tim = brcmf_parse_tlvs(ie, ie_len, WLAN_EID_TIM); |
2189 | if (tim) | 2224 | if (tim) |
2190 | dtim_period = tim->data[1]; | 2225 | dtim_period = tim->data[1]; |
2191 | else { | 2226 | else { |