nl80211: move scan API to wdev

The new P2P Device will have to be able to scan for
P2P search, so move scanning to use struct wireless_dev
instead of struct net_device.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

5 files changed, 37 insertions, 32 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 2781a411cecc..0557bb159025 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -708,7 +708,7 @@ static void wdev_cleanup_work(struct work_struct *work)
 
         cfg80211_lock_rdev(rdev);
 
-        if (WARN_ON(rdev->scan_req && rdev->scan_req->dev == wdev->netdev)) {
+        if (WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev)) {
                 rdev->scan_req->aborted = true;
                 ___cfg80211_scan_done(rdev, true);
         }
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 6a9a1d7f51d1..6472c7f928dc 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4130,7 +4130,7 @@ static int validate_scan_freqs(struct nlattr *freqs)
 static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
 {
         struct cfg80211_registered_device *rdev = info->user_ptr[0];
-        struct net_device *dev = info->user_ptr[1];
+        struct wireless_dev *wdev = info->user_ptr[1];
         struct cfg80211_scan_request *request;
         struct nlattr *attr;
         struct wiphy *wiphy;
@@ -4290,15 +4290,16 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
         request->no_cck =
                 nla_get_flag(info->attrs[NL80211_ATTR_TX_NO_CCK_RATE]);
 
-        request->dev = dev;
+        request->wdev = wdev;
         request->wiphy = &rdev->wiphy;
 
         rdev->scan_req = request;
-        err = rdev->ops->scan(&rdev->wiphy, dev, request);
+        err = rdev->ops->scan(&rdev->wiphy, request);
 
         if (!err) {
-                nl80211_send_scan_start(rdev, dev);
-                dev_hold(dev);
+                nl80211_send_scan_start(rdev, wdev);
+                if (wdev->netdev)
+                        dev_hold(wdev->netdev);
         } else {
  out_free:
                 rdev->scan_req = NULL;
@@ -7066,7 +7067,7 @@ static struct genl_ops nl80211_ops[] = {
                 .doit = nl80211_trigger_scan,
                 .policy = nl80211_policy,
                 .flags = GENL_ADMIN_PERM,
-                .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
+                .internal_flags = NL80211_FLAG_NEED_WDEV_UP |
                                   NL80211_FLAG_NEED_RTNL,
         },
         {
@@ -7458,7 +7459,7 @@ static int nl80211_add_scan_req(struct sk_buff *msg,
 
 static int nl80211_send_scan_msg(struct sk_buff *msg,
                                  struct cfg80211_registered_device *rdev,
-                                 struct net_device *netdev,
+                                 struct wireless_dev *wdev,
                                  u32 pid, u32 seq, int flags,
                                  u32 cmd)
 {
@@ -7469,7 +7470,9 @@ static int nl80211_send_scan_msg(struct sk_buff *msg,
                 return -1;
 
         if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
-            nla_put_u32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex))
+            (wdev->netdev && nla_put_u32(msg, NL80211_ATTR_IFINDEX,
+                                         wdev->netdev->ifindex)) ||
+            nla_put_u64(msg, NL80211_ATTR_WDEV, wdev_id(wdev)))
                 goto nla_put_failure;
 
         /* ignore errors and send incomplete event anyway */
@@ -7506,7 +7509,7 @@ nl80211_send_sched_scan_msg(struct sk_buff *msg,
 }
 
 void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
-                             struct net_device *netdev)
+                             struct wireless_dev *wdev)
 {
         struct sk_buff *msg;
 
@@ -7514,7 +7517,7 @@ void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
         if (!msg)
                 return;
 
-        if (nl80211_send_scan_msg(msg, rdev, netdev, 0, 0, 0,
+        if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
                                   NL80211_CMD_TRIGGER_SCAN) < 0) {
                 nlmsg_free(msg);
                 return;
@@ -7525,7 +7528,7 @@ void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
 }
 
 void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
-                            struct net_device *netdev)
+                            struct wireless_dev *wdev)
 {
         struct sk_buff *msg;
 
@@ -7533,7 +7536,7 @@ void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
         if (!msg)
                 return;
 
-        if (nl80211_send_scan_msg(msg, rdev, netdev, 0, 0, 0,
+        if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
                                   NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
                 nlmsg_free(msg);
                 return;
@@ -7544,7 +7547,7 @@ void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
 }
 
 void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
-                               struct net_device *netdev)
+                               struct wireless_dev *wdev)
 {
         struct sk_buff *msg;
 
@@ -7552,7 +7555,7 @@ void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
         if (!msg)
                 return;
 
-        if (nl80211_send_scan_msg(msg, rdev, netdev, 0, 0, 0,
+        if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,
                                   NL80211_CMD_SCAN_ABORTED) < 0) {
                 nlmsg_free(msg);
                 return;
diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h
index 0469303b5c3c..89ce99675e61 100644
--- a/net/wireless/nl80211.h
+++ b/net/wireless/nl80211.h
@@ -7,11 +7,11 @@ int nl80211_init(void);
 void nl80211_exit(void);
 void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
 void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
-                             struct net_device *netdev);
+                             struct wireless_dev *wdev);
 void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
-                            struct net_device *netdev);
+                            struct wireless_dev *wdev);
 void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
-                               struct net_device *netdev);
+                               struct wireless_dev *wdev);
 void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,
                              struct net_device *netdev, u32 cmd);
 void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev,
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index af2b1caa37fa..848523a2b22f 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -23,7 +23,7 @@
 void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak)
 {
         struct cfg80211_scan_request *request;
-        struct net_device *dev;
+        struct wireless_dev *wdev;
 #ifdef CONFIG_CFG80211_WEXT
         union iwreq_data wrqu;
 #endif
@@ -35,29 +35,31 @@ void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak)
         if (!request)
                 return;
 
-        dev = request->dev;
+        wdev = request->wdev;
 
         /*
          * This must be before sending the other events!
          * Otherwise, wpa_supplicant gets completely confused with
          * wext events.
          */
-        cfg80211_sme_scan_done(dev);
+        if (wdev->netdev)
+                cfg80211_sme_scan_done(wdev->netdev);
 
         if (request->aborted)
-                nl80211_send_scan_aborted(rdev, dev);
+                nl80211_send_scan_aborted(rdev, wdev);
         else
-                nl80211_send_scan_done(rdev, dev);
+                nl80211_send_scan_done(rdev, wdev);
 
 #ifdef CONFIG_CFG80211_WEXT
-        if (!request->aborted) {
+        if (wdev->netdev && !request->aborted) {
                 memset(&wrqu, 0, sizeof(wrqu));
 
-                wireless_send_event(dev, SIOCGIWSCAN, &wrqu, NULL);
+                wireless_send_event(wdev->netdev, SIOCGIWSCAN, &wrqu, NULL);
         }
 #endif
 
-        dev_put(dev);
+        if (wdev->netdev)
+                dev_put(wdev->netdev);
 
         rdev->scan_req = NULL;
 
@@ -955,7 +957,7 @@ int cfg80211_wext_siwscan(struct net_device *dev,
         }
 
         creq->wiphy = wiphy;
-        creq->dev = dev;
+        creq->wdev = dev->ieee80211_ptr;
         /* SSIDs come after channels */
         creq->ssids = (void *)&creq->channels[n_channels];
         creq->n_channels = n_channels;
@@ -1024,12 +1026,12 @@ int cfg80211_wext_siwscan(struct net_device *dev,
                         creq->rates[i] = (1 << wiphy->bands[i]->n_bitrates) - 1;
 
         rdev->scan_req = creq;
-        err = rdev->ops->scan(wiphy, dev, creq);
+        err = rdev->ops->scan(wiphy, creq);
         if (err) {
                 rdev->scan_req = NULL;
                 /* creq will be freed below */
         } else {
-                nl80211_send_scan_start(rdev, dev);
+                nl80211_send_scan_start(rdev, dev->ieee80211_ptr);
                 /* creq now owned by driver */
                 creq = NULL;
                 dev_hold(dev);
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index dec97981e689..6f39cb808302 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -136,15 +136,15 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev)
                 wdev->conn->params.ssid_len);
         request->ssids[0].ssid_len = wdev->conn->params.ssid_len;
 
-        request->dev = wdev->netdev;
+        request->wdev = wdev;
         request->wiphy = &rdev->wiphy;
 
         rdev->scan_req = request;
 
-        err = rdev->ops->scan(wdev->wiphy, wdev->netdev, request);
+        err = rdev->ops->scan(wdev->wiphy, request);
         if (!err) {
                 wdev->conn->state = CFG80211_CONN_SCANNING;
-                nl80211_send_scan_start(rdev, wdev->netdev);
+                nl80211_send_scan_start(rdev, wdev);
                 dev_hold(wdev->netdev);
         } else {
                 rdev->scan_req = NULL;