openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6655: replace typedef struct tagRDES1 

with struct vnt_rdes1 and members
wReqCount -> req_count
wReserved -> reserved

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2015-08-15 21:57:33 +01:00 committed by Greg Kroah-Hartman
parent de1c1862ca
commit 9fc7091cc2
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/vt6655/card.c
View File

@ -575,7 +575,7 @@ CARDvSafeResetRx(
pDesc = &(pDevice->aRD0Ring[uu]);
pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz);
pDesc->rd0.owner = OWNED_BY_NIC;
pDesc->m_rd1RD1.wReqCount = cpu_to_le16(pDevice->rx_buf_sz);
pDesc->rd1.req_count = cpu_to_le16(pDevice->rx_buf_sz);
}
/* init state, all RD is chip's */
@ -583,7 +583,7 @@ CARDvSafeResetRx(
pDesc = &(pDevice->aRD1Ring[uu]);
pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz);
pDesc->rd0.owner = OWNED_BY_NIC;
pDesc->m_rd1RD1.wReqCount = cpu_to_le16(pDevice->rx_buf_sz);
pDesc->rd1.req_count = cpu_to_le16(pDevice->rx_buf_sz);
}
/* set perPkt mode */

11
drivers/staging/vt6655/desc.h
View File

@ -189,16 +189,15 @@ struct vnt_rdes0 {
#endif
} __packed;
typedef struct tagRDES1 {
__le16 wReqCount;
unsigned short wReserved;
} __attribute__ ((__packed__))
SRDES1;
struct vnt_rdes1 {
__le16 req_count;
u16 reserved;
} __packed;
/* Rx descriptor*/
typedef struct tagSRxDesc {
volatile struct vnt_rdes0 rd0;
volatile SRDES1 m_rd1RD1;
volatile struct vnt_rdes1 rd1;
volatile __le32 buff_addr;
volatile __le32 next_desc;
struct tagSRxDesc *next __aligned(8);

2
drivers/staging/vt6655/device_main.c
View File

@ -818,7 +818,7 @@ static bool device_alloc_rx_buf(struct vnt_private *pDevice, PSRxDesc pRD)
pRD->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz);
pRD->rd0.owner = OWNED_BY_NIC;
pRD->m_rd1RD1.wReqCount = cpu_to_le16(pDevice->rx_buf_sz);
pRD->rd1.req_count = cpu_to_le16(pDevice->rx_buf_sz);
pRD->buff_addr = cpu_to_le32(pRDInfo->skb_dma);
return true;

2
drivers/staging/vt6655/dpc.c
View File

@ -143,7 +143,7 @@ bool vnt_receive_frame(struct vnt_private *priv, PSRxDesc curr_rd)
dma_unmap_single(&priv->pcid->dev, rd_info->skb_dma,
priv->rx_buf_sz, DMA_FROM_DEVICE);
frame_size = le16_to_cpu(curr_rd->m_rd1RD1.wReqCount)
frame_size = le16_to_cpu(curr_rd->rd1.req_count)
- le16_to_cpu(curr_rd->rd0.res_count);
if ((frame_size > 2364) || (frame_size < 33)) {