aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/mac80211.h2
-rw-r--r--net/mac80211/main.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e41b9a8d186f..2fab5a7e5db7 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -470,7 +470,6 @@ enum ieee80211_conf_flags {
470 * @listen_interval: listen interval in units of beacon interval 470 * @listen_interval: listen interval in units of beacon interval
471 * @flags: configuration flags defined above 471 * @flags: configuration flags defined above
472 * @power_level: requested transmit power (in dBm) 472 * @power_level: requested transmit power (in dBm)
473 * @max_antenna_gain: maximum antenna gain (in dBi)
474 * @antenna_sel_tx: transmit antenna selection, 0: default/diversity, 473 * @antenna_sel_tx: transmit antenna selection, 0: default/diversity,
475 * 1/2: antenna 0/1 474 * 1/2: antenna 0/1
476 * @antenna_sel_rx: receive antenna selection, like @antenna_sel_tx 475 * @antenna_sel_rx: receive antenna selection, like @antenna_sel_tx
@@ -485,7 +484,6 @@ struct ieee80211_conf {
485 u16 listen_interval; 484 u16 listen_interval;
486 u32 flags; 485 u32 flags;
487 int power_level; 486 int power_level;
488 int max_antenna_gain;
489 u8 antenna_sel_tx; 487 u8 antenna_sel_tx;
490 u8 antenna_sel_rx; 488 u8 antenna_sel_rx;
491 489
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 2ff26d03cd50..d1c4e86b215c 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -215,8 +215,6 @@ int ieee80211_hw_config(struct ieee80211_local *local)
215 local->hw.conf.power_level = min(chan->max_power, 215 local->hw.conf.power_level = min(chan->max_power,
216 local->hw.conf.power_level); 216 local->hw.conf.power_level);
217 217
218 local->hw.conf.max_antenna_gain = chan->max_antenna_gain;
219
220#ifdef CONFIG_MAC80211_VERBOSE_DEBUG 218#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
221 printk(KERN_DEBUG "%s: HW CONFIG: freq=%d\n", 219 printk(KERN_DEBUG "%s: HW CONFIG: freq=%d\n",
222 wiphy_name(local->hw.wiphy), chan->center_freq); 220 wiphy_name(local->hw.wiphy), chan->center_freq);