Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: vt6656: Replace typedef struct _RSP_CARD_INIT. 



Replace with struct vnt_rsp_card_rsp init_rsp in device_init_registers.

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

drivers/staging/vt6656/main_usb.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -300,6 +300,7 @@ static int device_init_registers(struct vnt_private *pDevice) 
{

{

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;

	struct vnt_cmd_card_init init_cmd;

	struct vnt_cmd_card_init init_cmd;

	struct vnt_rsp_card_init init_rsp;

	u8 abyBroadcastAddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

	u8 abyBroadcastAddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

	u8 abySNAP_RFC1042[ETH_ALEN] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};

	u8 abySNAP_RFC1042[ETH_ALEN] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};

	u8 abySNAP_Bridgetunnel[ETH_ALEN]

	u8 abySNAP_Bridgetunnel[ETH_ALEN]
@@ -307,7 +308,6 @@ static int device_init_registers(struct vnt_private *pDevice) 
	u8 byAntenna;

	u8 byAntenna;

	int ii;

	int ii;

	int ntStatus = STATUS_SUCCESS;

	int ntStatus = STATUS_SUCCESS;

	RSP_CARD_INIT   sInitRsp;

	u8 byTmp;

	u8 byTmp;

	u8 byCalibTXIQ = 0, byCalibTXDC = 0, byCalibRXIQ = 0;

	u8 byCalibTXIQ = 0, byCalibTXDC = 0, byCalibRXIQ = 0;
@@ -362,7 +362,7 @@ static int device_init_registers(struct vnt_private *pDevice) 
    }

    }





	ntStatus = CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_INIT_RSP, 0, 0,

	ntStatus = CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_INIT_RSP, 0, 0,

			sizeof(RSP_CARD_INIT), (u8 *) &(sInitRsp));

		sizeof(struct vnt_rsp_card_init), (u8 *)&init_rsp);

	if (ntStatus != STATUS_SUCCESS) {

	if (ntStatus != STATUS_SUCCESS) {

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

			"Cardinit request in status fail!\n");

			"Cardinit request in status fail!\n");
@@ -519,7 +519,7 @@ static int device_init_registers(struct vnt_private *pDevice) 
        pDevice->byMaxChannel = CB_MAX_CHANNEL;

        pDevice->byMaxChannel = CB_MAX_CHANNEL;





	/* get RFType */

	/* get RFType */

        pDevice->byRFType = sInitRsp.byRFType;

	pDevice->byRFType = init_rsp.rf_type;





        if ((pDevice->byRFType & RF_EMU) != 0) {

        if ((pDevice->byRFType & RF_EMU) != 0) {

		/* force change RevID for VT3253 emu */

		/* force change RevID for VT3253 emu */
@@ -570,7 +570,7 @@ static int device_init_registers(struct vnt_private *pDevice) 
        CARDbSetMediaChannel(pDevice, pMgmt->uCurrChannel);

        CARDbSetMediaChannel(pDevice, pMgmt->uCurrChannel);





	/* get permanent network address */

	/* get permanent network address */

	memcpy(pDevice->abyPermanentNetAddr, &sInitRsp.byNetAddr[0], 6);

	memcpy(pDevice->abyPermanentNetAddr, &init_rsp.net_addr[0], 6);

	memcpy(pDevice->abyCurrentNetAddr,

	memcpy(pDevice->abyCurrentNetAddr,

	       pDevice->abyPermanentNetAddr,

	       pDevice->abyPermanentNetAddr,

	       ETH_ALEN);

	       ETH_ALEN);

drivers/staging/vt6656/rndis.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -86,14 +86,14 @@ struct vnt_cmd_card_init 
	u8 long_retry_limit;

	u8 long_retry_limit;

};

};





typedef struct _RSP_CARD_INIT

struct vnt_rsp_card_init

{

{

    u8        byStatus;

	u8 status;

    u8        byNetAddr[6];

	u8 net_addr[6];

    u8        byRFType;

	u8 rf_type;

    u8        byMinChannel;

	u8 min_channel;

    u8        byMaxChannel;

	u8 max_channel;

} RSP_CARD_INIT, *PRSP_CARD_INIT;

};





typedef struct _CMD_SET_KEY

typedef struct _CMD_SET_KEY

{

{