From a99d7e80d46391d9e7253cfb30cd8ba1bd0b1b9f Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Mon, 6 Jun 2011 12:59:29 +0300
Subject: [PATCH] --- yaml --- r: 255724 b: refs/heads/master c:
 1d34d108e07680e2c07847d5e69a334cb4f96ab3 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/net/mac80211.h | 10 ++++++++++
 trunk/net/mac80211/mlme.c    |  7 +++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4d1f0a6695cc..8bdb74d0eafb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c48b1f729a75880d0895f0b23efaf551ee800a35
+refs/heads/master: 1d34d108e07680e2c07847d5e69a334cb4f96ab3
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 3b31ec95dd8e..e33fe795a3a4 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -2919,6 +2919,16 @@ void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif,
 			       enum nl80211_cqm_rssi_threshold_event rssi_event,
 			       gfp_t gfp);
 
+/**
+ * ieee80211_get_operstate - get the operstate of the vif
+ *
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
+ *
+ * The driver might need to know the operstate of the net_device
+ * (specifically, whether the link is IF_OPER_UP after resume)
+ */
+unsigned char ieee80211_get_operstate(struct ieee80211_vif *vif);
+
 /**
  * ieee80211_chswitch_done - Complete channel switch process
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index d595265d6c22..0c6e9ef8c7f8 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2652,3 +2652,10 @@ void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif,
 	cfg80211_cqm_rssi_notify(sdata->dev, rssi_event, gfp);
 }
 EXPORT_SYMBOL(ieee80211_cqm_rssi_notify);
+
+unsigned char ieee80211_get_operstate(struct ieee80211_vif *vif)
+{
+	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
+	return sdata->dev->operstate;
+}
+EXPORT_SYMBOL(ieee80211_get_operstate);