aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-10-25 05:31:42 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 14:50:32 -0500
commitb3f51e941bdd559775c80c137c355ce71efb49d7 (patch)
tree5188b19d56cc0d79c17f571b563cd2deb070bfa4 /net/mac80211
parent204d130426206071b08c0aa74002fbdb67960eed (diff)
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d7504ab61a34..eb660310ea7c 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -714,7 +714,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
714 } 714 }
715 715
716 /* if present, add any custom IEs that go before HT */ 716 /* if present, add any custom IEs that go before HT */
717 if (assoc_data->ie_len && assoc_data->ie) { 717 if (assoc_data->ie_len) {
718 static const u8 before_ht[] = { 718 static const u8 before_ht[] = {
719 WLAN_EID_SSID, 719 WLAN_EID_SSID,
720 WLAN_EID_SUPP_RATES, 720 WLAN_EID_SUPP_RATES,
@@ -748,7 +748,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
748 &assoc_data->ap_vht_cap); 748 &assoc_data->ap_vht_cap);
749 749
750 /* if present, add any custom non-vendor IEs that go after HT */ 750 /* if present, add any custom non-vendor IEs that go after HT */
751 if (assoc_data->ie_len && assoc_data->ie) { 751 if (assoc_data->ie_len) {
752 noffset = ieee80211_ie_split_vendor(assoc_data->ie, 752 noffset = ieee80211_ie_split_vendor(assoc_data->ie,
753 assoc_data->ie_len, 753 assoc_data->ie_len,
754 offset); 754 offset);
@@ -779,7 +779,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
779 } 779 }
780 780
781 /* add any remaining custom (i.e. vendor specific here) IEs */ 781 /* add any remaining custom (i.e. vendor specific here) IEs */
782 if (assoc_data->ie_len && assoc_data->ie) { 782 if (assoc_data->ie_len) {
783 noffset = assoc_data->ie_len; 783 noffset = assoc_data->ie_len;
784 pos = skb_put(skb, noffset - offset); 784 pos = skb_put(skb, noffset - offset);
785 memcpy(pos, assoc_data->ie + offset, noffset - offset); 785 memcpy(pos, assoc_data->ie + offset, noffset - offset);