Commit f9d1968c authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rxtx remove dead code 



Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 169cd2e4

drivers/staging/vt6656/power.c

+0 −8
Original line number Diff line number Diff line
@@ -217,9 +217,6 @@ void PSvSendPSPOLL(struct vnt_private *pDevice) 
	pTxPacket->cbPayloadLen = 0;



	/* log failure if sending failed */

	if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING)

		DBG_PRT(MSG_LEVEL_DEBUG,

			KERN_INFO "Send PS-Poll packet failed..\n");

}



/*
@@ -273,11 +270,6 @@ int PSbSendNullPacket(struct vnt_private *pDevice) 
	pTxPacket->cbMPDULen = WLAN_HDR_ADDR3_LEN;

	pTxPacket->cbPayloadLen = 0;

	/* log error if sending failed */

	if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {

		DBG_PRT(MSG_LEVEL_DEBUG,

			KERN_INFO "Send Null Packet failed !\n");

		return false;

	}

	return true;

}

drivers/staging/vt6656/rxtx.c

+0 −1259

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/vt6656/rxtx.h

+0 −5
Original line number Diff line number Diff line
@@ -253,11 +253,6 @@ struct vnt_beacon_buffer { 
	struct ieee80211_mgmt mgmt_hdr;

} __packed;



void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb);

int nsDMA_tx_packet(struct vnt_private *, struct sk_buff *skb);

CMD_STATUS csMgmt_xmit(struct vnt_private *, struct vnt_tx_mgmt *);

CMD_STATUS csBeacon_xmit(struct vnt_private *, struct vnt_tx_mgmt *);



int vnt_tx_packet(struct vnt_private *, struct sk_buff *);

int vnt_beacon_make(struct vnt_private *, struct ieee80211_vif *);

int vnt_beacon_enable(struct vnt_private *, struct ieee80211_vif *,

drivers/staging/vt6656/wmgr.c

+0 −19
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ void vMgrAssocBeginSta(struct vnt_private *pDevice, 


    if (pTxPacket != NULL ){

        // send the frame

        *pStatus = csMgmt_xmit(pDevice, pTxPacket);

        if (*pStatus == CMD_STATUS_PENDING) {

            pMgmt->eCurrState = WMAC_STATE_ASSOCPENDING;

            *pStatus = CMD_STATUS_SUCCESS;
@@ -349,7 +348,6 @@ void vMgrReAssocBeginSta(struct vnt_private *pDevice, 


    if (pTxPacket != NULL ){

        // send the frame

        *pStatus = csMgmt_xmit(pDevice, pTxPacket);

        if (*pStatus != CMD_STATUS_PENDING) {

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Reassociation tx failed.\n");

        }
@@ -408,7 +406,6 @@ void vMgrDisassocBeginSta(struct vnt_private *pDevice, 
    pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;



    // send the frame

    *pStatus = csMgmt_xmit(pDevice, pTxPacket);

    if (*pStatus == CMD_STATUS_PENDING) {

        pMgmt->eCurrState = WMAC_STATE_IDLE;

        *pStatus = CMD_STATUS_SUCCESS;
@@ -541,7 +538,6 @@ static void s_vMgrRxAssocRequest(struct vnt_private *pDevice, 
                );

    if (pTxPacket != NULL ){

        /* send the frame */

        Status = csMgmt_xmit(pDevice, pTxPacket);

        if (Status != CMD_STATUS_PENDING) {

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Assoc response tx failed\n");

        }
@@ -685,7 +681,6 @@ static void s_vMgrRxReAssocRequest(struct vnt_private *pDevice, 


    if (pTxPacket != NULL ){

        /* send the frame */

        Status = csMgmt_xmit(pDevice, pTxPacket);

        if (Status != CMD_STATUS_PENDING) {

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:ReAssoc response tx failed\n");

        }
@@ -869,7 +864,6 @@ void vMgrAuthenBeginSta(struct vnt_private *pDevice, 
    pTxPacket->cbMPDULen = sFrame.len;

    pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;



    *pStatus = csMgmt_xmit(pDevice, pTxPacket);

    if (*pStatus == CMD_STATUS_PENDING){

        pMgmt->eCurrState = WMAC_STATE_AUTHPENDING;

        *pStatus = CMD_STATUS_SUCCESS;
@@ -920,7 +914,6 @@ void vMgrDeAuthenBeginSta(struct vnt_private *pDevice, 
    pTxPacket->cbMPDULen = sFrame.len;

    pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;



    *pStatus = csMgmt_xmit(pDevice, pTxPacket);

    if (*pStatus == CMD_STATUS_PENDING){

        *pStatus = CMD_STATUS_SUCCESS;

    }
@@ -1069,9 +1062,6 @@ static void s_vMgrRxAuthenSequence_1(struct vnt_private *pDevice, 
    pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;

    // send the frame

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_1 tx.. \n");

    if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_1 tx failed.\n");

    }

    return;

}
@@ -1149,9 +1139,6 @@ static void s_vMgrRxAuthenSequence_2(struct vnt_private *pDevice, 
                pTxPacket->cbMPDULen = sFrame.len;

                pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;

                // send the frame

                if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {

                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Auth_reply sequence_2 tx failed.\n");

                }

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Auth_reply sequence_2 tx ...\n");

            }

            else {
@@ -1247,9 +1234,6 @@ reply: 
    pTxPacket->cbMPDULen = sFrame.len;

    pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;

    // send the frame

    if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_4 tx failed.\n");

    }

    return;



}
@@ -3853,7 +3837,6 @@ static void s_vMgrRxProbeRequest(struct vnt_private *pDevice, 
                    );

        if (pTxPacket != NULL ){

            /* send the frame */

            Status = csMgmt_xmit(pDevice, pTxPacket);

            if (Status != CMD_STATUS_PENDING) {

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Probe response tx failed\n");

            }
@@ -4055,8 +4038,6 @@ int bMgrPrepareBeaconToSend(struct vnt_private *pDevice, 


	spin_lock_irqsave(&pDevice->lock, flags);



	csBeacon_xmit(pDevice, pTxPacket);



	spin_unlock_irqrestore(&pDevice->lock, flags);



	vnt_mac_reg_bits_on(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);

CRA Git | Maintained and supported by SUSTech CRA and CCSE