mac80211: remove max_antenna_gain config

The antenna gain isn't exactly configurable, despite the belief of
some unnamed individual who thinks that the EEPROM might influence
it.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e41b9a8d186f2348e613628aaa469d72981ae86d..2fab5a7e5db70d9e8b63af794a9c3e92b170de5c 100644 (file)
--- a/include/net/mac80211.h
+++ b/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/net/mac80211/main.c b/net/mac80211/main.c
index 2ff26d03cd503338302e40cc88ecafb1ccb3c0a9..d1c4e86b215ce1f26805e11ee034af95ff969c01 100644 (file)
--- a/net/mac80211/main.c
+++ b/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);