diff options
| author | Mike McCormack <mikem@ring3k.org> | 2010-09-20 23:12:09 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-21 10:57:00 -0700 |
| commit | 61d0e67af6a54ae4868449e6865d523c4f3d1e3c (patch) | |
| tree | 9f6e48c3f628dd65beeea610adb37e68b5523977 /drivers/staging/rtl8192e | |
| parent | a6b1d95908dbbc679846e6d362298e60445f5b7e (diff) | |
staging: rtl8192e: Remove dead code from rtl8192_set_chan()
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
| -rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index ef590e6d9ab..58e7037b8b7 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){ - - priv->ieee80211->link_state = WLAN_LINK_ASSOCIATED; - priv->ieee80211->master_chan = ch; - rtl8192_update_beacon_ch(dev); - } -#endif - - /* this hack should avoid frame TX during channel setting*/ - - - // tx = read_nic_dword(dev,TX_CONF); - // tx &= ~TX_LOOPBACK_MASK; + struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); -#ifndef LOOP_TEST - //TODO - // write_nic_dword(dev,TX_CONF, tx |( TX_LOOPBACK_MAC<<TX_LOOPBACK_SHIFT)); + priv->chan = ch; - //need to implement rf set channel here WB + /* need to implement rf set channel here WB */ - if (priv->rf_set_chan) - priv->rf_set_chan(dev,priv->chan); - // mdelay(10); - // write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT)); -#endif + if (priv->rf_set_chan) + priv->rf_set_chan(dev, priv->chan); } void rtl8192_rx_enable(struct net_device *dev) |