Merge tag 'mac80211-next-for-davem-2016-07-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
One more set of new features:
 * beacon report (for radio measurement) support in cfg80211/mac80211
 * hwsim: allow wmediumd in namespaces
 * mac80211: extend 160MHz workaround to CSA IEs
 * mesh: properly encrypt group-addressed privacy action frames
 * mesh: allow setting peer AID
 * first steps for MU-MIMO monitor mode
 * along with various other cleanups and improvements
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 39d9abd309ea..7645e97362c0 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -220,7 +220,7 @@ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
 
         if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
                 if (WARN_ON(!rdev->scan_req->notified))
-                        rdev->scan_req->aborted = true;
+                        rdev->scan_req->info.aborted = true;
                 ___cfg80211_scan_done(rdev, false);
         }
 }
@@ -1087,7 +1087,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                 cfg80211_update_iface_num(rdev, wdev->iftype, -1);
                 if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
                         if (WARN_ON(!rdev->scan_req->notified))
-                                rdev->scan_req->aborted = true;
+                                rdev->scan_req->info.aborted = true;
                         ___cfg80211_scan_done(rdev, false);
                 }