From: Malcolm Priestley Date: Fri, 14 Aug 2015 21:58:48 +0000 (+0100) Subject: staging: vt6655: struct tagDEVICE_TD_INFO resize dwReqCount. X-Git-Tag: v4.3-rc1~158^2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=531a9c524a54b7d232b6bf6631c460450dd41dbf;p=thirdparty%2Fkernel%2Flinux.git staging: vt6655: struct tagDEVICE_TD_INFO resize dwReqCount. dwReqCount is no bigger than u16 Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h index 6efe825f77101..ab52c56232354 100644 --- a/drivers/staging/vt6655/desc.h +++ b/drivers/staging/vt6655/desc.h @@ -245,7 +245,7 @@ typedef struct tagDEVICE_TD_INFO { struct sk_buff *skb; unsigned char *buf; dma_addr_t buf_dma; - unsigned long dwReqCount; + u16 dwReqCount; unsigned long dwHeaderLength; unsigned char byFlags; } DEVICE_TD_INFO, *PDEVICE_TD_INFO; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 947e8685db552..c3b7bd40dc068 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1193,7 +1193,7 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) /* Set TSR1 & ReqCount in TxDescHead */ head_td->td1.tcr |= (TCR_STP | TCR_EDP | EDMSDU); - head_td->td1.req_count = cpu_to_le16((u16)head_td->pTDInfo->dwReqCount); + head_td->td1.req_count = cpu_to_le16(head_td->pTDInfo->dwReqCount); head_td->buff_addr = cpu_to_le32(head_td->pTDInfo->buf_dma); diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 380b879c05db4..f3f6b15b7251e 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1200,7 +1200,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, ptdCurr = (PSTxDesc)pHeadTD; - ptdCurr->pTDInfo->dwReqCount = cbReqCount; + ptdCurr->pTDInfo->dwReqCount = (u16)cbReqCount; ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength; return cbHeaderLength;