3 files changed, 7 insertions, 17 deletions

diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index ee85b41a4dfd..8866a2b69c94 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -162,11 +162,6 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
 
         rcu_read_lock();
         ies = rcu_dereference(bss->ies);
-        if (WARN_ON(!ies)) {
-                /* should never happen */
-                rcu_read_unlock();
-                return -EINVAL;
-        }
         beacon_ie = kmemdup(ies->data, ies->len, GFP_ATOMIC);
         beacon_ie_len = ies->len;
         rcu_read_unlock();
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 04a702d1f2a5..fb766314b3a1 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1287,10 +1287,10 @@ struct cfg80211_bss_ies {
  * @tsf: timestamp of last received update
  * @beacon_interval: the beacon interval as from the frame
  * @capability: the capability field in host byte order
- * @ies: the information elements (Note that there
- *      is no guarantee that these are well-formed!); this is a pointer to
- *      either the beacon_ies or proberesp_ies depending on whether Probe
- *      Response frame has been received
+ * @ies: the information elements (Note that there is no guarantee that these
+ *      are well-formed!); this is a pointer to either the beacon_ies or
+ *      proberesp_ies depending on whether Probe Response frame has been
+ *      received. It is always non-%NULL.
  * @beacon_ies: the information elements from the last Beacon frame
  *      (implementation note: if @hidden_beacon_bss is set this struct doesn't
  *      own the beacon_ies, but they're just pointers to the ones from the
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,
 
         rcu_read_lock();
         ies = rcu_dereference(bss->pub.ies);
-        if (ies) {
-                rem = ies->len;
-                ie = ies->data;
-        } else {
-                rem = 0;
-                ie = NULL;
-        }
+        rem = ies->len;
+        ie = ies->data;
 
-        while (ies && rem >= 2) {
+        while (rem >= 2) {
                 /* invalid data */
                 if (ie[1] > rem - 2)
                         break;