---

yaml --- r: 175145 b: refs/heads/master c: fb034f8 h: refs/heads/master i: 175143: 861db03 v: v3
git-mirror · Dec 11, 2009 · 66dbde2 · 66dbde2
1 parent 384058b
commit 66dbde2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;
 };