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

staging: vt6656: nsDMA_tx_packet Move pContext later. 



call s_vGetFreeContext later in function skiping large
chunk of code.

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

drivers/staging/vt6656/rxtx.c

+7 −9
Original line number Diff line number Diff line
@@ -2172,14 +2172,6 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb) 
        }

    }



	pContext = s_vGetFreeContext(pDevice);



    if (pContext == NULL) {

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG" pContext == NULL\n");

        dev_kfree_skb_irq(skb);

        return STATUS_RESOURCES;

    }



	memcpy(&pDevice->sTxEthHeader, skb->data, ETH_HLEN);



//mike add:station mode check eapol-key challenge--->
@@ -2402,7 +2394,6 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb) 


            if (pTransmitKey == NULL) {

                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"return no tx key\n");

		pContext->bBoolInUse = false;

                dev_kfree_skb_irq(skb);

                pStats->tx_dropped++;

                return STATUS_FAILURE;
@@ -2410,6 +2401,13 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb) 
        }

    }



	pContext = s_vGetFreeContext(pDevice);

	if (!pContext) {

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG" pContext == NULL\n");

		dev_kfree_skb_irq(skb);

		return STATUS_RESOURCES;

	}



	pTX_Buffer = (struct vnt_tx_buffer *)&pContext->Data[0];



    fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType,