From 1e6d5634fae444941eaa68ae155c754c747437f2 Mon Sep 17 00:00:00 2001
From: David Kilroy <kilroyd@googlemail.com>
Date: Thu, 18 Jun 2009 23:21:13 +0100
Subject: [PATCH] --- yaml --- r: 158840 b: refs/heads/master c:
 f1f74825fe01ac77204ca34e3240dec50a8207c2 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/net/cfg80211.h | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 384c754d9c9c..5fe31ddefc2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90e3012e94be0755a516f60f5339a2a08f4a7d0a
+refs/heads/master: f1f74825fe01ac77204ca34e3240dec50a8207c2
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index 90f9bfa3bfc2..dba7874d1963 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/include/net/cfg80211.h
@@ -1058,6 +1058,17 @@ static inline void *wiphy_priv(struct wiphy *wiphy)
 	return &wiphy->priv;
 }
 
+/**
+ * priv_to_wiphy - return the wiphy containing the priv
+ *
+ * @priv: a pointer previously returned by wiphy_priv
+ */
+static inline struct wiphy *priv_to_wiphy(void *priv)
+{
+	BUG_ON(!priv);
+	return container_of(priv, struct wiphy, priv);
+}
+
 /**
  * set_wiphy_dev - set device pointer for wiphy
  *