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

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

staging: vt6655: device_main replace pRD with rd. 



Removing camel case.

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

drivers/staging/vt6655/device_main.c

+16 −16
Original line number Diff line number Diff line
@@ -702,37 +702,37 @@ static void device_free_td1_ring(struct vnt_private *priv) 


static int device_rx_srv(struct vnt_private *priv, unsigned int uIdx)

{

	struct vnt_rx_desc *pRD;

	struct vnt_rx_desc *rd;

	int works = 0;



	for (pRD = priv->pCurrRD[uIdx];

	     pRD->rd0.owner == OWNED_BY_HOST;

	     pRD = pRD->next) {

	for (rd = priv->pCurrRD[uIdx];

	     rd->rd0.owner == OWNED_BY_HOST;

	     rd = rd->next) {

		if (works++ > 15)

			break;



		if (!pRD->rd_info->skb)

		if (!rd->rd_info->skb)

			break;



		if (vnt_receive_frame(priv, pRD)) {

			if (!device_alloc_rx_buf(priv, pRD)) {

		if (vnt_receive_frame(priv, rd)) {

			if (!device_alloc_rx_buf(priv, rd)) {

				dev_err(&priv->pcid->dev,

					"can not allocate rx buf\n");

				break;

			}

		}

		pRD->rd0.owner = OWNED_BY_NIC;

		rd->rd0.owner = OWNED_BY_NIC;

	}



	priv->pCurrRD[uIdx] = pRD;

	priv->pCurrRD[uIdx] = rd;



	return works;

}



static bool device_alloc_rx_buf(struct vnt_private *priv,

				struct vnt_rx_desc *pRD)

				struct vnt_rx_desc *rd)

{

	struct vnt_rd_info *rd_info = pRD->rd_info;

	struct vnt_rd_info *rd_info = rd->rd_info;



	rd_info->skb = dev_alloc_skb((int)priv->rx_buf_sz);

	if (rd_info->skb == NULL)
@@ -743,12 +743,12 @@ static bool device_alloc_rx_buf(struct vnt_private *priv, 
			       skb_put(rd_info->skb, skb_tailroom(rd_info->skb)),

			       priv->rx_buf_sz, DMA_FROM_DEVICE);



	*((unsigned int *)&pRD->rd0) = 0; /* FIX cast */

	*((unsigned int *)&rd->rd0) = 0; /* FIX cast */



	pRD->rd0.res_count = cpu_to_le16(priv->rx_buf_sz);

	pRD->rd0.owner = OWNED_BY_NIC;

	pRD->rd1.req_count = cpu_to_le16(priv->rx_buf_sz);

	pRD->buff_addr = cpu_to_le32(rd_info->skb_dma);

	rd->rd0.res_count = cpu_to_le16(priv->rx_buf_sz);

	rd->rd0.owner = OWNED_BY_NIC;

	rd->rd1.req_count = cpu_to_le16(priv->rx_buf_sz);

	rd->buff_addr = cpu_to_le32(rd_info->skb_dma);



	return true;

}