cfg80211: invert P2P-Device vs. netdev check ordering

In cfg80211_can_use_iftype_chan(), check for P2P Device
first, and then for netdevs. This doesn't really change
anything but makes the code a bit easier to read since
it may not be obvious for everyone at first that a P2P
device has no netdev.

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

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 3d8a1334f4a9c7414076ec47d032dc63754ab930..a7046a4333e93ad1c3bbce3dcdef6869cc3b79f2 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1278,12 +1278,12 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev,
        list_for_each_entry(wdev_iter, &rdev->wdev_list, list) {
                if (wdev_iter == wdev)
                        continue;
-               if (wdev_iter->netdev) {
-                       if (!netif_running(wdev_iter->netdev))
-                               continue;
-               } else if (wdev_iter->iftype == NL80211_IFTYPE_P2P_DEVICE) {
+               if (wdev_iter->iftype == NL80211_IFTYPE_P2P_DEVICE) {
                        if (!wdev_iter->p2p_started)
                                continue;
+               } else if (wdev_iter->netdev) {
+                       if (!netif_running(wdev_iter->netdev))
+                               continue;
                } else {
                        WARN_ON(1);
                }