From b9bb2a9dc6fc1eb984c9979e65d9e94989f8cf57 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 7 Oct 2008 12:04:35 +0200
Subject: [PATCH] --- yaml --- r: 121562 b: refs/heads/master c:
 e87a2feea75e3cba7af43ed9317b56b282d87742 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 06e6cb0e48eb..1f43f254efc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d73782fdde76554016abf73b46f843b29f520848
+refs/heads/master: e87a2feea75e3cba7af43ed9317b56b282d87742
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index e41b9a8d186f..2fab5a7e5db7 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -470,7 +470,6 @@ enum ieee80211_conf_flags {
  * @listen_interval: listen interval in units of beacon interval
  * @flags: configuration flags defined above
  * @power_level: requested transmit power (in dBm)
- * @max_antenna_gain: maximum antenna gain (in dBi)
  * @antenna_sel_tx: transmit antenna selection, 0: default/diversity,
  *	1/2: antenna 0/1
  * @antenna_sel_rx: receive antenna selection, like @antenna_sel_tx
@@ -485,7 +484,6 @@ struct ieee80211_conf {
 	u16 listen_interval;
 	u32 flags;
 	int power_level;
-	int max_antenna_gain;
 	u8 antenna_sel_tx;
 	u8 antenna_sel_rx;
 
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index 2ff26d03cd50..d1c4e86b215c 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -215,8 +215,6 @@ int ieee80211_hw_config(struct ieee80211_local *local)
 		local->hw.conf.power_level = min(chan->max_power,
 					       local->hw.conf.power_level);
 
-	local->hw.conf.max_antenna_gain = chan->max_antenna_gain;
-
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
 	printk(KERN_DEBUG "%s: HW CONFIG: freq=%d\n",
 	       wiphy_name(local->hw.wiphy), chan->center_freq);