aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-05 10:51:29 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-02-11 12:44:58 -0500
commit83c7aa1a1475ae1c42640ab6e4559016142efc67 (patch)
tree1a93edf5cb47eea45a120bd34ab0c72383cb28b6 /net/wireless
parentb207cdb07f3f01ec1adaac62e9d0cc918c60a81a (diff)
cfg80211: remove scan ies NULL check
There's no way scan BSS IEs can be NULL as even if the allocation fails the frame is discarded. Remove some code checking for this and document that it is always non-NULL. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/scan.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 5e0983d60428..02a238329c83 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1293,15 +1293,10 @@ ieee80211_bss(struct wiphy *wiphy, struct iw_request_info *info,
1293 1293
1294 rcu_read_lock(); 1294 rcu_read_lock();
1295 ies = rcu_dereference(bss->pub.ies); 1295 ies = rcu_dereference(bss->pub.ies);
1296 if (ies) { 1296 rem = ies->len;
1297 rem = ies->len; 1297 ie = ies->data;
1298 ie = ies->data;
1299 } else {
1300 rem = 0;
1301 ie = NULL;
1302 }
1303 1298
1304 while (ies && rem >= 2) { 1299 while (rem >= 2) {
1305 /* invalid data */ 1300 /* invalid data */
1306 if (ie[1] > rem - 2) 1301 if (ie[1] > rem - 2)
1307 break; 1302 break;