staging: vt6655: replaced typedef struct tagTDES1 (9cc8eac9) · Commits · 戴 / test

drivers/staging/vt6655/desc.h

+6 −7

Original line number	Diff line number	Diff line
		@@ -234,12 +234,11 @@ struct vnt_tdes0 {
		#endif
		} __packed;

		typedef struct tagTDES1 {
		volatile __le16 wReqCount;
		volatile unsigned char byTCR;
		volatile unsigned char byReserved;
		} __attribute__ ((__packed__))
		STDES1;
		struct vnt_tdes1 {
		volatile __le16 req_count;
		volatile u8 tcr;
		volatile u8 reserved;
		} __packed;

		typedef struct tagDEVICE_TD_INFO {
		void *mic_hdr;
		@@ -254,7 +253,7 @@ typedef struct tagDEVICE_TD_INFO {
		/* transmit descriptor */
		typedef struct tagSTxDesc {
		volatile struct vnt_tdes0 td0;
		volatile STDES1 m_td1TD1;
		volatile struct vnt_tdes1 td1;
		volatile __le32 buff_addr;
		volatile __le32 next_desc;
		struct tagSTxDesc *next __aligned(8);

+4 −5

Original line number	Diff line number	Diff line
		@@ -915,7 +915,7 @@ static int device_tx_srv(struct vnt_private *pDevice, unsigned int uIdx)
		byTsr1 = pTD->td0.tsr1;

		/* Only the status of first TD in the chain is correct */
		if (pTD->m_td1TD1.byTCR & TCR_STP) {
		if (pTD->td1.tcr & TCR_STP) {
		if ((pTD->pTDInfo->byFlags & TD_FLAGS_NETIF_SKB) != 0) {
		if (!(byTsr1 & TSR1_TERR)) {
		if (byTsr0 != 0) {
		@@ -1174,7 +1174,7 @@ static int vnt_tx_packet(struct vnt_private priv, struct sk_buff skb)

		head_td = priv->apCurrTD[dma_idx];

		head_td->m_td1TD1.byTCR = 0;
		head_td->td1.tcr = 0;

		head_td->pTDInfo->skb = skb;

		@@ -1192,9 +1192,8 @@ static int vnt_tx_packet(struct vnt_private priv, struct sk_buff skb)
		priv->bPWBitOn = false;

		/* Set TSR1 & ReqCount in TxDescHead */
		head_td->m_td1TD1.byTCR \|= (TCR_STP \| TCR_EDP \| EDMSDU);
		head_td->m_td1TD1.wReqCount =
		cpu_to_le16((u16)head_td->pTDInfo->dwReqCount);
		head_td->td1.tcr \|= (TCR_STP \| TCR_EDP \| EDMSDU);
		head_td->td1.req_count = cpu_to_le16((u16)head_td->pTDInfo->dwReqCount);

		head_td->buff_addr = cpu_to_le32(head_td->pTDInfo->buf_dma);