From 61d0e67af6a54ae4868449e6865d523c4f3d1e3c Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Mon, 20 Sep 2010 23:12:09 +0900 Subject: [PATCH] staging: rtl8192e: Remove dead code from rtl8192_set_chan() Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/r8192E_core.c | 33 ++++---------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index ef590e6d9ab7..58e7037b8b72 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -25,7 +25,6 @@ */ -#undef LOOP_TEST #undef RX_DONT_PASS_UL #undef DEBUG_EPROM #undef DEBUG_RX_VERBOSE @@ -839,36 +838,14 @@ void rtl8192_update_msr(struct net_device *dev) void rtl8192_set_chan(struct net_device *dev,short ch) { - struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); - RT_TRACE(COMP_RF, "=====>%s()====ch:%d\n", __FUNCTION__, ch); - priv->chan=ch; -#if 0 - if(priv->ieee80211->iw_mode == IW_MODE_ADHOC || - priv->ieee80211->iw_mode == IW_MODE_MASTER){ + struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); - priv->ieee80211->link_state = WLAN_LINK_ASSOCIATED; - priv->ieee80211->master_chan = ch; - rtl8192_update_beacon_ch(dev); - } -#endif + priv->chan = ch; - /* this hack should avoid frame TX during channel setting*/ + /* need to implement rf set channel here WB */ - - // tx = read_nic_dword(dev,TX_CONF); - // tx &= ~TX_LOOPBACK_MASK; - -#ifndef LOOP_TEST - //TODO - // write_nic_dword(dev,TX_CONF, tx |( TX_LOOPBACK_MAC<rf_set_chan) - priv->rf_set_chan(dev,priv->chan); - // mdelay(10); - // write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<rf_set_chan) + priv->rf_set_chan(dev, priv->chan); } void rtl8192_rx_enable(struct net_device *dev)