mac80211: remove useless tests for array
Coverity points out that checking assoc_data->ie is completely useless since it's an array in the struct and can't be NULL - remove the useless checks. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Родитель
204d130426
Коммит
b3f51e941b
|
@ -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 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[] = {
|
static const u8 before_ht[] = {
|
||||||
WLAN_EID_SSID,
|
WLAN_EID_SSID,
|
||||||
WLAN_EID_SUPP_RATES,
|
WLAN_EID_SUPP_RATES,
|
||||||
|
@ -748,7 +748,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
|
||||||
&assoc_data->ap_vht_cap);
|
&assoc_data->ap_vht_cap);
|
||||||
|
|
||||||
/* if present, add any custom non-vendor IEs that go after HT */
|
/* 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,
|
noffset = ieee80211_ie_split_vendor(assoc_data->ie,
|
||||||
assoc_data->ie_len,
|
assoc_data->ie_len,
|
||||||
offset);
|
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 */
|
/* 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;
|
noffset = assoc_data->ie_len;
|
||||||
pos = skb_put(skb, noffset - offset);
|
pos = skb_put(skb, noffset - offset);
|
||||||
memcpy(pos, assoc_data->ie + offset, noffset - offset);
|
memcpy(pos, assoc_data->ie + offset, noffset - offset);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче