[PATCH 2/3] rtl8192e cleanups

Sean MacLennan seanm at seanm.ca
Fri May 31 02:20:02 UTC 2013


Removing all the statistics reduced cmpk_handle_interrupt_status to
just setting bibsscoordinator... which was then never referenced.
Remove the function and bibsscoordinator.

Also removed cmdpkt_beacontimerinterrupt_819xusb while I was at it.

Signed-off-by: Sean MacLennan <seanm at seanm.ca>
---
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
index e1915ee..fdd53b1 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
@@ -135,64 +135,11 @@ static void cmpk_handle_tx_feedback(struct net_device *dev, u8 *pmsg)
 	cmpk_count_txstatistic(dev, (struct cmpk_txfb *)pmsg);
 }
 
-static void cmdpkt_beacontimerinterrupt_819xusb(struct net_device *dev)
-{
-	struct r8192_priv *priv = rtllib_priv(dev);
-	u16 tx_rate;
-
-	if ((priv->rtllib->current_network.mode == IEEE_A)  ||
-	    (priv->rtllib->current_network.mode == IEEE_N_5G) ||
-	    ((priv->rtllib->current_network.mode == IEEE_N_24G)  &&
-	    (!priv->rtllib->pHTInfo->bCurSuppCCK))) {
-		tx_rate = 60;
-		DMESG("send beacon frame  tx rate is 6Mbpm\n");
-	} else {
-		tx_rate = 10;
-		DMESG("send beacon frame  tx rate is 1Mbpm\n");
-	}
-}
-
-static void cmpk_handle_interrupt_status(struct net_device *dev, u8 *pmsg)
-{
-	struct cmpk_intr_sta rx_intr_status;	/* */
-	struct r8192_priv *priv = rtllib_priv(dev);
-
-	DMESG("---> cmpk_Handle_Interrupt_Status()\n");
-
-
-	rx_intr_status.length = pmsg[1];
-	if (rx_intr_status.length != (sizeof(struct cmpk_intr_sta) - 2)) {
-		DMESG("cmpk_Handle_Interrupt_Status: wrong length!\n");
-		return;
-	}
-
-
-	if (priv->rtllib->iw_mode == IW_MODE_ADHOC) {
-		rx_intr_status.interrupt_status = *((u32 *)(pmsg + 4));
-
-		DMESG("interrupt status = 0x%x\n",
-		      rx_intr_status.interrupt_status);
-
-		if (rx_intr_status.interrupt_status & ISR_TxBcnOk)
-			priv->rtllib->bibsscoordinator = true;
-		else if (rx_intr_status.interrupt_status & ISR_TxBcnErr)
-			priv->rtllib->bibsscoordinator = false;
-
-		if (rx_intr_status.interrupt_status & ISR_BcnTimerIntr)
-			cmdpkt_beacontimerinterrupt_819xusb(dev);
-	}
-
-	DMESG("<---- cmpk_handle_interrupt_status()\n");
-
-}	/* cmpk_handle_interrupt_status */
-
-
 static void cmpk_handle_query_config_rx(struct net_device *dev, u8 *pmsg)
 {
 #if 0
 	cmpk_query_cfg_t	rx_query_cfg;	/* */
 
-
 	rx_query_cfg.cfg_action = (pmsg[4] & 0x80000000)>>31;
 	rx_query_cfg.cfg_type = (pmsg[4] & 0x60) >> 5;
 	rx_query_cfg.cfg_size = (pmsg[4] & 0x18) >> 3;
@@ -272,7 +219,6 @@ u32 cmpk_message_handle_rx(struct net_device *dev,
 		case RX_INTERRUPT_STATUS:
 			RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():"
 				 "RX_INTERRUPT_STATUS\n");
-			cmpk_handle_interrupt_status(dev, pcmd_buff);
 			cmd_length = sizeof(struct cmpk_intr_sta);
 			break;
 		case BOTH_QUERY_CONFIG:
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 3485ef1..801e2ee 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2321,7 +2321,6 @@ struct rtllib_device {
 	u32	sta_edca_param[4];
 	bool aggregation;
 	bool enable_rx_imm_BA;
-	bool bibsscoordinator;
 
 	bool	bdynamic_txpower_enable;
 



More information about the devel mailing list