From df7f79d0122d38ab1370f74757e9690a8216a984 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Sat, 21 Feb 2009 00:04:20 -0500
Subject: [PATCH] --- yaml --- r: 134921 b: refs/heads/master c:
 85fd129a721e6e892dbaaf05203baf819730f699 h: refs/heads/master i:   134919:
 fef44ceb7eb5ee52fc32e8de1dbbec20be6513cc v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/core.c | 5 ++++-
 trunk/net/wireless/core.h | 7 +++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 952d71ae8eac..6e83b833b57b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5850a7a4fd5bcab4f6a2c49e5b4ab9ebb1d5d44
+refs/heads/master: 85fd129a721e6e892dbaaf05203baf819730f699
diff --git a/trunk/net/wireless/core.c b/trunk/net/wireless/core.c
index 2b3e786ec53f..35d457b2751e 100644
--- a/trunk/net/wireless/core.c
+++ b/trunk/net/wireless/core.c
@@ -42,6 +42,9 @@ cfg80211_drv_by_wiphy_idx(int wiphy_idx)
 {
 	struct cfg80211_registered_device *result = NULL, *drv;
 
+	if (!wiphy_idx_valid(wiphy_idx))
+		return NULL;
+
 	list_for_each_entry(drv, &cfg80211_drv_list, list) {
 		if (drv->wiphy_idx == wiphy_idx) {
 			result = drv;
@@ -225,7 +228,7 @@ struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv)
 
 	drv->wiphy_idx = wiphy_counter++;
 
-	if (unlikely(drv->wiphy_idx < 0)) {
+	if (unlikely(!wiphy_idx_valid(drv->wiphy_idx))) {
 		wiphy_counter--;
 		mutex_unlock(&cfg80211_drv_mutex);
 		/* ugh, wrapped! */
diff --git a/trunk/net/wireless/core.h b/trunk/net/wireless/core.h
index 178378124800..4f2e0fe38ce3 100644
--- a/trunk/net/wireless/core.h
+++ b/trunk/net/wireless/core.h
@@ -63,6 +63,13 @@ struct cfg80211_registered_device *wiphy_to_dev(struct wiphy *wiphy)
 	return container_of(wiphy, struct cfg80211_registered_device, wiphy);
 }
 
+/* Note 0 is valid, hence phy0 */
+static inline
+bool wiphy_idx_valid(int wiphy_idx)
+{
+	return (wiphy_idx >= 0);
+}
+
 extern struct mutex cfg80211_drv_mutex;
 extern struct list_head cfg80211_drv_list;