From 66dbde213c1d7e22c8d201015be0f3425869d4a4 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 6 Oct 2009 15:49:52 +0100
Subject: [PATCH] --- yaml --- r: 175145 b: refs/heads/master c:
 fb034f841dae4b811901a23194484eaf62b60026 h: refs/heads/master i:   175143:
 861db030d1931e500b654cc707b1a2a15c38986e v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/et131x/et1310_tx.c | 1 -
 trunk/drivers/staging/et131x/et1310_tx.h | 5 ++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2b6d30cc4509..5e1b9e7984d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c78732ad75b3917f6a93292be1612527d9c0be9d
+refs/heads/master: fb034f841dae4b811901a23194484eaf62b60026
diff --git a/trunk/drivers/staging/et131x/et1310_tx.c b/trunk/drivers/staging/et131x/et1310_tx.c
index b2b4b6884469..a59818567ded 100644
--- a/trunk/drivers/staging/et131x/et1310_tx.c
+++ b/trunk/drivers/staging/et131x/et1310_tx.c
@@ -368,7 +368,6 @@ static int et131x_send_packet(struct sk_buff *skb,
 
 	spin_unlock_irqrestore(&etdev->TCBReadyQLock, flags);
 
-	tcb->len = skb->len;
 	tcb->skb = skb;
 
 	if ((skb->data != NULL) && ((skb->len - skb->data_len) >= 6)) {
diff --git a/trunk/drivers/staging/et131x/et1310_tx.h b/trunk/drivers/staging/et131x/et1310_tx.h
index 3e2f281e2186..eced34a3cf2d 100644
--- a/trunk/drivers/staging/et131x/et1310_tx.h
+++ b/trunk/drivers/staging/et131x/et1310_tx.h
@@ -106,11 +106,10 @@ struct tx_desc {
 struct tcb {
 	struct tcb *next;	/* Next entry in ring */
 	u32 flags;		/* Our flags for the packet */
-	u32 count;
+	u32 count;		/* Used to spot stuck/lost packets */
 	u32 stale;		/* Used to spot stuck/lost packets */
 	struct sk_buff *skb;	/* Network skb we are tied to */
-	u32 len;
-	u32 index;
+	u32 index;		/* Ring indexes */
 	u32 index_start;
 };