From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 14 Jul 2011 23:38:19 +0000 (-0500)
Subject: staging: rtl8192e: Remove dead code associated with _ENABLE_SW_BEACON
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1bb9d9a9cbb438b6b060a8daa572ac6d80ef415f;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

staging: rtl8192e: Remove dead code associated with _ENABLE_SW_BEACON

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c
index 511953254243..d441a5401324 100644
--- a/drivers/staging/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/r8192E_dev.c
@@ -2052,17 +2052,10 @@ rtl8192_InitializeVariables(struct net_device  *dev)
 
 	strcpy(priv->nick, "rtl8192E");
 
-#ifdef _ENABLE_SW_BEACON
-	priv->rtllib->softmac_features  = IEEE_SOFTMAC_SCAN |
-		IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ |
-		IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE  |
-		IEEE_SOFTMAC_BEACONS;
-#else
 	priv->rtllib->softmac_features  = IEEE_SOFTMAC_SCAN |
 		IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ |
 		IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE /* |
 		IEEE_SOFTMAC_BEACONS*/;
-#endif
 
 	priv->rtllib->tx_headroom = sizeof(TX_FWINFO_8190PCI);
 
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
index 3711eb431f0d..217b298a9e86 100644
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl_core.c
@@ -1136,13 +1136,8 @@ static void rtl8192_init_priv_handler(struct net_device* dev)
 	priv->rtllib->SetBWModeHandler		= rtl8192_SetBWMode;
 	priv->rf_set_chan			= rtl8192_phy_SwChnl;
 
-#ifdef _ENABLE_SW_BEACON
-	priv->rtllib->start_send_beacons = NULL;
-	priv->rtllib->stop_send_beacons = NULL;
-#else
 	priv->rtllib->start_send_beacons = rtl8192e_start_beacon;
 	priv->rtllib->stop_send_beacons = rtl8192_stop_beacon;
-#endif
 
 	priv->rtllib->sta_wake_up = rtl8192_hw_wakeup;
 	priv->rtllib->enter_sleep_state = rtl8192_hw_to_sleep;
@@ -2100,11 +2095,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
 	if (tcb_desc->queue_index != BEACON_QUEUE) {
 		idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries;
 	} else {
-#ifdef _ENABLE_SW_BEACON
-		idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries;
-#else
 		idx = 0;
-#endif
 	}
 
 	pdesc = &ring->desc[idx];
@@ -2843,9 +2834,6 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs)
 
 	if (inta & IMR_BDOK) {
 		RT_TRACE(COMP_INTR, "beacon interrupt!\n");
-#ifdef _ENABLE_SW_BEACON
-		rtl8192_tx_isr(dev, BEACON_QUEUE);
-#endif
 	}
 
 	if (inta  & IMR_MGNTDOK ) {
@@ -2880,9 +2868,7 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs)
 
 	if (inta & IMR_BcnInt) {
 		RT_TRACE(COMP_INTR, "prepare beacon for interrupt!\n");
-#ifndef _ENABLE_SW_BEACON
 		tasklet_schedule(&priv->irq_prepare_beacon_tasklet);
-#endif
 	}
 
 	if (inta & IMR_RDU) {