staging: vt6656: Remove always 0 variable dwDiagRefCount

Remove > 0 code.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c
index e430b35463b6b3595aa52a7fa8bb4962c9aff0f0..5a4fa0e2581b14355422957ff46ce2b59700b638 100644 (file)
--- a/drivers/staging/vt6656/channel.c
+++ b/drivers/staging/vt6656/channel.c
@@ -423,8 +423,7 @@ void CHvInitChannelTable(struct vnt_private *pDevice)
             break;
     }
 
-    if ((pDevice->dwDiagRefCount != 0) ||
-        (pDevice->b11hEable == true)) {
+    if (pDevice->b11hEable == true) {
         if (bMultiBand == true) {
                for (ii = 0; ii < CB_MAX_CHANNEL; ii++) {
                        sChannelTbl[ii+1].bValid = true;

diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index b7a6e14e4d9fd44cfeec8b89fd3d5a859ed4f134..ec8acbd4abaac2bb5332e4ee39def2028ca59ecd 100644 (file)
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -697,7 +697,6 @@ struct vnt_private {
        u8 byBBPreEDIndex;
 
        int bRadioCmd;
-       u32 dwDiagRefCount;
 
        /* For FOE Tuning */
        u8  byFOETuning;

diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index e545232f670b5776fb55da67b42b1721cfa49036..1e8f64bff03c665046c8b51b72bb1cf5809e3aa3 100644 (file)
--- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -740,9 +740,6 @@ int RFbSetPower(struct vnt_private *priv, u32 rate, u32 channel)
        int ret = true;
        u8 power = priv->byCCKPwr;
 
-       if (priv->dwDiagRefCount)
-               return true;
-
        if (channel == 0)
                return -EINVAL;
 

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 5601331708f3fee5b9f30e4fa2cff500acbed16b..a95575fdd408fabe967fad869577bbd2a62ea634 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -978,28 +978,19 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
                        bSoftWEP = true; /* WEP 256 */
        }
 
-    // Get pkt type
-    if (ntohs(psEthHeader->h_proto) > ETH_DATA_LEN) {
-        if (pDevice->dwDiagRefCount == 0) {
-            cb802_1_H_len = 8;
-        } else {
-            cb802_1_H_len = 2;
-        }
-    } else {
-        cb802_1_H_len = 0;
-    }
+       /* Get pkt type */
+       if (ntohs(psEthHeader->h_proto) > ETH_DATA_LEN)
+               cb802_1_H_len = 8;
+       else
+               cb802_1_H_len = 0;
 
     cbFrameBodySize = uSkbPacketLen - ETH_HLEN + cb802_1_H_len;
 
     //Set packet type
     pTxBufHead->wFIFOCtl |= (u16)(byPktType<<8);
 
-    if (pDevice->dwDiagRefCount != 0) {
-        bNeedACK = false;
-        pTxBufHead->wFIFOCtl = pTxBufHead->wFIFOCtl & (~FIFOCTL_NEEDACK);
-    } else { //if (pDevice->dwDiagRefCount != 0) {
        if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
-           (pDevice->eOPMode == OP_MODE_AP)) {
+                       (pDevice->eOPMode == OP_MODE_AP)) {
                if (is_multicast_ether_addr(psEthHeader->h_dest)) {
                        bNeedACK = false;
                        pTxBufHead->wFIFOCtl =
@@ -1008,13 +999,11 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
                        bNeedACK = true;
                        pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK;
                }
-        }
-        else {
-            // MSDUs in Infra mode always need ACK
-            bNeedACK = true;
-            pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK;
-        }
-    } //if (pDevice->dwDiagRefCount != 0) {
+       } else {
+               /* MSDUs in Infra mode always need ACK */
+               bNeedACK = true;
+               pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK;
+       }
 
     pTxBufHead->wTimeStamp = DEFAULT_MSDU_LIFETIME_RES_64us;
 
@@ -1183,24 +1172,19 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
         }
     }
 
-    // 802.1H
-    if (ntohs(psEthHeader->h_proto) > ETH_DATA_LEN) {
-       if (pDevice->dwDiagRefCount == 0) {
+       /* 802.1H */
+       if (ntohs(psEthHeader->h_proto) > ETH_DATA_LEN) {
                if ((psEthHeader->h_proto == cpu_to_be16(ETH_P_IPX)) ||
-                   (psEthHeader->h_proto == cpu_to_le16(0xF380))) {
+                       (psEthHeader->h_proto == cpu_to_le16(0xF380)))
                        memcpy((u8 *) (pbyPayloadHead),
-                              abySNAP_Bridgetunnel, 6);
-            } else {
-                memcpy((u8 *) (pbyPayloadHead), &abySNAP_RFC1042[0], 6);
-            }
-            pbyType = (u8 *) (pbyPayloadHead + 6);
-            memcpy(pbyType, &(psEthHeader->h_proto), sizeof(u16));
-        } else {
-            memcpy((u8 *) (pbyPayloadHead), &(psEthHeader->h_proto), sizeof(u16));
+                                       abySNAP_Bridgetunnel, 6);
+               else
+                       memcpy((u8 *) (pbyPayloadHead), &abySNAP_RFC1042[0], 6);
 
-        }
+               pbyType = (u8 *) (pbyPayloadHead + 6);
 
-    }
+               memcpy(pbyType, &(psEthHeader->h_proto), sizeof(u16));
+       }
 
     if (pPacket != NULL) {
         // Copy the Packet into a tx Buffer

diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 2d05ccb58a7a8dfc090d1236d9430dc511f92e20..6b9522914634fa3a7db5b69e89483db648ea8823 100644 (file)
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -283,8 +283,6 @@ void vRunCommand(struct work_struct *work)
        if (pDevice->Flags & fMP_DISCONNECTED)
                return;
 
-       if (pDevice->dwDiagRefCount != 0)
-               return;
        if (pDevice->bCmdRunning != true)
                return;