diff options
| author |   Johannes Berg <johannes@sipsolutions.net> | 2008-10-09 12:18:04 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:06 -0400 |
| commit | 0f4ac38b5999c3d51adad52d61c56c1b99c247ec (patch) | |
| tree | 0376bd4904597495ce788883d371d794e8c85f69 /drivers/net/wireless/b43legacy/main.c | |
| parent | 802.11: clean up/fix HT support (diff) | |
| download | linux-dev-0f4ac38b5999c3d51adad52d61c56c1b99c247ec.tar.xz linux-dev-0f4ac38b5999c3d51adad52d61c56c1b99c247ec.zip | |
mac80211: kill hw.conf.antenna_sel_{rx,tx}
Never actually used.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43legacy/main.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index c66d57560e7c..867f01ce45c7 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -2556,20 +2556,6 @@ init_failure: return err; } -static int b43legacy_antenna_from_ieee80211(u8 antenna) -{ - switch (antenna) { - case 0: /* default/diversity */ - return B43legacy_ANTENNA_DEFAULT; - case 1: /* Antenna 0 */ - return B43legacy_ANTENNA0; - case 2: /* Antenna 1 */ - return B43legacy_ANTENNA1; - default: - return B43legacy_ANTENNA_DEFAULT; - } -} - static int b43legacy_op_dev_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) { @@ -2583,8 +2569,8 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw, int err = 0; u32 savedirqs; - antenna_tx = b43legacy_antenna_from_ieee80211(conf->antenna_sel_tx); - antenna_rx = b43legacy_antenna_from_ieee80211(conf->antenna_sel_rx); + antenna_tx = B43legacy_ANTENNA_DEFAULT; + antenna_rx = B43legacy_ANTENNA_DEFAULT; mutex_lock(&wl->mutex); dev = wl->current_dev; |