|
@@ -714,7 +714,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
|
|
|
}
|
|
|
|
|
|
/* if present, add any custom IEs that go before HT */
|
|
|
- if (assoc_data->ie_len && assoc_data->ie) {
|
|
|
+ if (assoc_data->ie_len) {
|
|
|
static const u8 before_ht[] = {
|
|
|
WLAN_EID_SSID,
|
|
|
WLAN_EID_SUPP_RATES,
|
|
@@ -748,7 +748,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
|
|
|
&assoc_data->ap_vht_cap);
|
|
|
|
|
|
/* if present, add any custom non-vendor IEs that go after HT */
|
|
|
- if (assoc_data->ie_len && assoc_data->ie) {
|
|
|
+ if (assoc_data->ie_len) {
|
|
|
noffset = ieee80211_ie_split_vendor(assoc_data->ie,
|
|
|
assoc_data->ie_len,
|
|
|
offset);
|
|
@@ -779,7 +779,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
|
|
|
}
|
|
|
|
|
|
/* add any remaining custom (i.e. vendor specific here) IEs */
|
|
|
- if (assoc_data->ie_len && assoc_data->ie) {
|
|
|
+ if (assoc_data->ie_len) {
|
|
|
noffset = assoc_data->ie_len;
|
|
|
pos = skb_put(skb, noffset - offset);
|
|
|
memcpy(pos, assoc_data->ie + offset, noffset - offset);
|