mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
staging: vt6655: device_tx_srv rename pTD
Following the convention elsewhere for vnt_tx_desc rename desc. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
12f2ee356e
commit
9f31b69559
1 changed files with 11 additions and 11 deletions
|
@ -831,23 +831,23 @@ static int vnt_int_report_rate(struct vnt_private *priv,
|
|||
|
||||
static int device_tx_srv(struct vnt_private *priv, unsigned int uIdx)
|
||||
{
|
||||
struct vnt_tx_desc *pTD;
|
||||
struct vnt_tx_desc *desc;
|
||||
int works = 0;
|
||||
unsigned char byTsr0;
|
||||
unsigned char byTsr1;
|
||||
|
||||
for (pTD = priv->apTailTD[uIdx]; priv->iTDUsed[uIdx] > 0; pTD = pTD->next) {
|
||||
if (pTD->td0.owner == OWNED_BY_NIC)
|
||||
for (desc = priv->apTailTD[uIdx]; priv->iTDUsed[uIdx] > 0; desc = desc->next) {
|
||||
if (desc->td0.owner == OWNED_BY_NIC)
|
||||
break;
|
||||
if (works++ > 15)
|
||||
break;
|
||||
|
||||
byTsr0 = pTD->td0.tsr0;
|
||||
byTsr1 = pTD->td0.tsr1;
|
||||
byTsr0 = desc->td0.tsr0;
|
||||
byTsr1 = desc->td0.tsr1;
|
||||
|
||||
/* Only the status of first TD in the chain is correct */
|
||||
if (pTD->td1.tcr & TCR_STP) {
|
||||
if ((pTD->td_info->flags & TD_FLAGS_NETIF_SKB) != 0) {
|
||||
if (desc->td1.tcr & TCR_STP) {
|
||||
if ((desc->td_info->flags & TD_FLAGS_NETIF_SKB) != 0) {
|
||||
if (!(byTsr1 & TSR1_TERR)) {
|
||||
if (byTsr0 != 0) {
|
||||
pr_debug(" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X]\n",
|
||||
|
@ -861,20 +861,20 @@ static int device_tx_srv(struct vnt_private *priv, unsigned int uIdx)
|
|||
}
|
||||
|
||||
if (byTsr1 & TSR1_TERR) {
|
||||
if ((pTD->td_info->flags & TD_FLAGS_PRIV_SKB) != 0) {
|
||||
if ((desc->td_info->flags & TD_FLAGS_PRIV_SKB) != 0) {
|
||||
pr_debug(" Tx[%d] fail has error. tsr1[%02X] tsr0[%02X]\n",
|
||||
(int)uIdx, byTsr1, byTsr0);
|
||||
}
|
||||
}
|
||||
|
||||
vnt_int_report_rate(priv, pTD->td_info, byTsr0, byTsr1);
|
||||
vnt_int_report_rate(priv, desc->td_info, byTsr0, byTsr1);
|
||||
|
||||
device_free_tx_buf(priv, pTD);
|
||||
device_free_tx_buf(priv, desc);
|
||||
priv->iTDUsed[uIdx]--;
|
||||
}
|
||||
}
|
||||
|
||||
priv->apTailTD[uIdx] = pTD;
|
||||
priv->apTailTD[uIdx] = desc;
|
||||
|
||||
return works;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue