From e3ef032adcfee453b38a81bf0501247b94e8a6e7 Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Wed, 16 May 2012 19:09:48 +0300
Subject: [PATCH] --- yaml --- r: 313975 b: refs/heads/master c:
 51ca9d8db280b960345e7306e6a036dd3880ecff h: refs/heads/master i:   313973:
 15ffebe99cee95e6ac203757f0b2dd2b9b6d6a49   313971:
 15e154be1d9bc9c590a56533d1f466ac11ca09fc   313967:
 76e805546bb4af828a212ed8895c0780500f7364 v: v3

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

diff --git a/[refs] b/[refs]
index 0d9cdaaecb59..38fc5128ba07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b90bd9d14f866318497acee571f79e621a735d69
+refs/heads/master: 51ca9d8db280b960345e7306e6a036dd3880ecff
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 98da61e52a45..d2ed86da8e4c 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -3555,16 +3555,6 @@ 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 419301c69582..0c4e26ff7d91 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -3530,10 +3530,3 @@ 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);