From 52d9ed61eee1c056e92c1a8ba6f56e912bb574b2 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 19 Apr 2013 12:19:39 +0200 Subject: [PATCH] --- yaml --- r: 369594 b: refs/heads/master c: 6e3ab5543bed9dffb7d1a6404c3782284a432a70 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/util.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 10376d002a25..ea2af0e919d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65e8d5b8cbff766628dad7d366986676f18b1e89 +refs/heads/master: 6e3ab5543bed9dffb7d1a6404c3782284a432a70 diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c index 3d8a1334f4a9..a7046a4333e9 100644 --- a/trunk/net/wireless/util.c +++ b/trunk/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); }