projects / cascardo / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
staging: vt6655: remove dead code
[cascardo/linux.git] / drivers / staging / vt6655 / dpc.c
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index 771bf35..37fa4af 100644 (file)
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -60,7 +60,6 @@
 /*---------------------  Static Classes  ----------------------------*/
 
 /*---------------------  Static Variables  --------------------------*/
-//static int          msglevel                =MSG_LEVEL_DEBUG;
 static int msglevel = MSG_LEVEL_INFO;
 
 const unsigned char acbyRxRate[MAX_RATE] =
@@ -327,15 +326,11 @@ device_receive_frame(
        PS802_11Header pMACHeader;
        bool bRxeapol_key = false;
 
-//    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "---------- device_receive_frame---\n");
-
        skb = pRDInfo->skb;
 
 //PLICE_DEBUG->
-#if 1
        pci_unmap_single(pDevice->pcid, pRDInfo->skb_dma,
                         pDevice->rx_buf_sz, PCI_DMA_FROMDEVICE);
-#endif
 //PLICE_DEBUG<-
        pwFrameSize = (unsigned short *)(skb->data + 2);
        FrameSize = cpu_to_le16(pCurrRD->m_rd1RD1.wReqCount) - cpu_to_le16(pCurrRD->m_rd0RD0.wResCount);
@@ -366,7 +361,6 @@ device_receive_frame(
                return false;
        }
 //PLICE_DEBUG->
-#if 1
        // update receive statistic counter
        STAvUpdateRDStatCounter(&pDevice->scStatistic,
                                *pbyRsr,
@@ -375,8 +369,6 @@ device_receive_frame(
                                pbyFrame,
                                FrameSize);
 
-#endif
-
        pMACHeader = (PS802_11Header)((unsigned char *)(skb->data) + 8);
 //PLICE_DEBUG<-
        if (pDevice->bMeasureInProgress) {
@@ -492,8 +484,6 @@ device_receive_frame(
                                                pDevice->s802_11Counter.TKIPICVErrors++;
                                        } else if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_CCMP)) {
                                                pDevice->s802_11Counter.CCMPDecryptErrors++;
-                                       } else if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_WEP)) {
-//                      pDevice->s802_11Counter.WEPICVErrorCount.QuadPart++;
                                        }
                                }
                                return false;
@@ -557,13 +547,9 @@ device_receive_frame(
                        pRxPacket->byRxRate = s_byGetRateIdx(*pbyRxRate);
                        pRxPacket->byRxChannel = (*pbyRxSts) >> 2;
 //PLICE_DEBUG->
-//EnQueue(pDevice,pRxPacket);
 
 #ifdef THREAD
                        EnQueue(pDevice, pRxPacket);
-
-                       //up(&pDevice->mlme_semaphore);
-                       //Enque (pDevice->FirstRecvMngList,pDevice->LastRecvMngList,pMgmt);
 #else
 
 #ifdef TASK_LET
@@ -571,12 +557,10 @@ device_receive_frame(
                        tasklet_schedule(&pDevice->RxMngWorkItem);
 #else
                        vMgrRxManagePacket((void *)pDevice, pDevice->pMgmt, pRxPacket);
-                       //tasklet_schedule(&pDevice->RxMngWorkItem);
 #endif
 
 #endif
 //PLICE_DEBUG<-
-                       //vMgrRxManagePacket((void *)pDevice, pDevice->pMgmt, pRxPacket);
                        // hostap Deamon handle 802.11 management
                        if (pDevice->bEnableHostapd) {
                                skb->dev = pDevice->apdev;
@@ -590,9 +574,8 @@ device_receive_frame(
                                netif_rx(skb);
                                return true;
                        }
-               } else {
-                       // Control Frame
                }
+
                return false;
        } else {
                if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
@@ -643,14 +626,9 @@ device_receive_frame(
 // Data frame Handle
 
        if (pDevice->bEnablePSMode) {
-               if (IS_FC_MOREDATA((skb->data+4))) {
-                       if (*pbyRsr & RSR_ADDROK) {
-                               //PSbSendPSPOLL((PSDevice)pDevice);
-                       }
-               } else {
-                       if (pDevice->pMgmt->bInTIMWake == true) {
+               if (!IS_FC_MOREDATA((skb->data+4))) {
+                       if (pDevice->pMgmt->bInTIMWake == true)
                                pDevice->pMgmt->bInTIMWake = false;
-                       }
                }
        }
 
@@ -765,16 +743,12 @@ device_receive_frame(
 
                        pdwMIC_L = (__le32 *)(skb->data + 4 + FrameSize);
                        pdwMIC_R = (__le32 *)(skb->data + 4 + FrameSize + 4);
-                       //DBG_PRN_GRP12(("RxL: %lx, RxR: %lx\n", *pdwMIC_L, *pdwMIC_R));
-                       //DBG_PRN_GRP12(("LocalL: %lx, LocalR: %lx\n", dwLocalMIC_L, dwLocalMIC_R));
-                       //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dwMICKey0= %lx,dwMICKey1= %lx \n", dwMICKey0, dwMICKey1);
 
                        if ((le32_to_cpu(*pdwMIC_L) != dwLocalMIC_L) ||
                            (le32_to_cpu(*pdwMIC_R) != dwLocalMIC_R) ||
                            pDevice->bRxMICFail) {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "MIC comparison is fail!\n");
                                pDevice->bRxMICFail = false;
-                               //pDevice->s802_11Counter.TKIPLocalMICFailures.QuadPart++;
                                pDevice->s802_11Counter.TKIPLocalMICFailures++;
                                if (bDeFragRx) {
                                        if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
@@ -813,10 +787,8 @@ device_receive_frame(
                                        if ((pDevice->pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
                                            (pDevice->pMgmt->eCurrState == WMAC_STATE_ASSOC) &&
                                            (*pbyRsr & (RSR_ADDRBROAD | RSR_ADDRMULTI)) == 0) {
-                                               //s802_11_Status.Flags = NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR;
                                                wpahdr->type = VIAWGET_PTK_MIC_MSG;
                                        } else {
-                                               //s802_11_Status.Flags = NDIS_802_11_AUTH_REQUEST_GROUP_ERROR;
                                                wpahdr->type = VIAWGET_GTK_MIC_MSG;
                                        }
                                        wpahdr->resp_ie_len = 0;
@@ -863,10 +835,8 @@ device_receive_frame(
                                    !((dwRxTSC47_16 == 0) && (dwLocalTSC47_16 == 0xFFFFFFFF))) {
                                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "TSC is illegal~~!\n ");
                                        if (pKey->byCipherSuite == KEY_CTL_TKIP)
-                                               //pDevice->s802_11Counter.TKIPReplays.QuadPart++;
                                                pDevice->s802_11Counter.TKIPReplays++;
                                        else
-                                               //pDevice->s802_11Counter.CCMPReplays.QuadPart++;
                                                pDevice->s802_11Counter.CCMPReplays++;
 
                                        if (bDeFragRx) {
@@ -881,10 +851,6 @@ device_receive_frame(
                }
        } // ----- End of Reply Counter Check --------------------------
 
-       if ((pKey != NULL) && (bIsWEP)) {
-//      pDevice->s802_11Counter.DecryptSuccessCount.QuadPart++;
-       }
-
        s_vProcessRxMACHeader(pDevice, (unsigned char *)(skb->data+4), FrameSize, bIsWEP, bExtIV, &cbHeaderOffset);
        FrameSize -= cbHeaderOffset;
        cbHeaderOffset += 4;        // 4 is Rcv buffer header
@@ -917,22 +883,6 @@ device_receive_frame(
        skb->protocol = eth_type_trans(skb, skb->dev);
 
        //drop frame not met IEEE 802.3
-/*
-  if (pDevice->flags & DEVICE_FLAGS_VAL_PKT_LEN) {
-  if ((skb->protocol==htons(ETH_P_802_3)) &&
-  (skb->len!=htons(skb->mac.ethernet->h_proto))) {
-  pStats->rx_length_errors++;
-  pStats->rx_dropped++;
-  if (bDeFragRx) {
-  if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
-  DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n",
-  pDevice->dev->name);
-  }
-  }
-  return false;
-  }
-  }
-*/
 
        skb->ip_summed = CHECKSUM_NONE;
        pStats->rx_bytes += skb->len;
@@ -1121,19 +1071,11 @@ static bool s_bHandleRxEncryption(
 
        if (pKey == NULL) {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pKey == NULL\n");
-               if (byDecMode == KEY_CTL_WEP) {
-//            pDevice->s802_11Counter.WEPUndecryptableCount.QuadPart++;
-               } else if (pDevice->bLinkPass) {
-//            pDevice->s802_11Counter.DecryptFailureCount.QuadPart++;
-               }
+
                return false;
        }
        if (byDecMode != pKey->byCipherSuite) {
-               if (byDecMode == KEY_CTL_WEP) {
-//            pDevice->s802_11Counter.WEPUndecryptableCount.QuadPart++;
-               } else if (pDevice->bLinkPass) {
-//            pDevice->s802_11Counter.DecryptFailureCount.QuadPart++;
-               }
+
                *pKeyOut = NULL;
                return false;
        }
@@ -1231,14 +1173,8 @@ static bool s_bHostWepRxEncryption(
 
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "AES:%d %d %d\n", pDevice->pMgmt->byCSSPK, pDevice->pMgmt->byCSSGK, byDecMode);
 
-       if (byDecMode != pKey->byCipherSuite) {
-               if (byDecMode == KEY_CTL_WEP) {
-//            pDevice->s802_11Counter.WEPUndecryptableCount.QuadPart++;
-               } else if (pDevice->bLinkPass) {
-//            pDevice->s802_11Counter.DecryptFailureCount.QuadPart++;
-               }
+       if (byDecMode != pKey->byCipherSuite)
                return false;
-       }
 
        if (byDecMode == KEY_CTL_WEP) {
                // handle WEP
Unnamed repository; edit this file 'description' to name the repository.