From 8b8d38584a7a899ed47de4e44443b0304377369b Mon Sep 17 00:00:00 2001
From: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Date: Wed, 11 Apr 2012 15:16:12 +0530
Subject: [PATCH] --- yaml --- r: 300952 b: refs/heads/master c:
 0446b49c3350ad1fdbc5a3f8f8223fc8af7d853b h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/net/mac80211/ieee80211_i.h |  3 ---
 trunk/net/mac80211/scan.c        | 14 --------------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index d57b1f355308..c12cdfe71446 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d90b570898f7cc3dd0b26d4e646f464408b04022
+refs/heads/master: 0446b49c3350ad1fdbc5a3f8f8223fc8af7d853b
diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h
index 8cc4bc101409..bd7a451b0849 100644
--- a/trunk/net/mac80211/ieee80211_i.h
+++ b/trunk/net/mac80211/ieee80211_i.h
@@ -1273,9 +1273,6 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
 			  struct ieee802_11_elems *elems,
 			  struct ieee80211_channel *channel,
 			  bool beacon);
-struct ieee80211_bss *
-ieee80211_rx_bss_get(struct ieee80211_local *local, u8 *bssid, int freq,
-		     u8 *ssid, u8 ssid_len);
 void ieee80211_rx_bss_put(struct ieee80211_local *local,
 			  struct ieee80211_bss *bss);
 
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
index 56175933c28f..45f5aa229efd 100644
--- a/trunk/net/mac80211/scan.c
+++ b/trunk/net/mac80211/scan.c
@@ -29,20 +29,6 @@
 #define IEEE80211_CHANNEL_TIME (HZ / 33)
 #define IEEE80211_PASSIVE_CHANNEL_TIME (HZ / 8)
 
-struct ieee80211_bss *
-ieee80211_rx_bss_get(struct ieee80211_local *local, u8 *bssid, int freq,
-		     u8 *ssid, u8 ssid_len)
-{
-	struct cfg80211_bss *cbss;
-
-	cbss = cfg80211_get_bss(local->hw.wiphy,
-				ieee80211_get_channel(local->hw.wiphy, freq),
-				bssid, ssid, ssid_len, 0, 0);
-	if (!cbss)
-		return NULL;
-	return (void *)cbss->priv;
-}
-
 static void ieee80211_rx_bss_free(struct cfg80211_bss *cbss)
 {
 	struct ieee80211_bss *bss = (void *)cbss->priv;