From 3c6bf50684ba45a0dbcc9aee04e97c0210275ca1 Mon Sep 17 00:00:00 2001 From: Giuseppe CAVALLARO Date: Fri, 17 Sep 2010 03:23:42 +0000 Subject: [PATCH] --- yaml --- r: 214569 b: refs/heads/master c: b71c7aaa1e2a9858f0c469026098fbd6e046d7bb h: refs/heads/master i: 214567: d4f6dae249c126853fb60baf7ffd759b8615ca63 v: v3 --- [refs] | 2 +- trunk/drivers/net/stmmac/enh_desc.c | 2 +- trunk/drivers/net/stmmac/norm_desc.c | 17 +---------------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 367a14647e28..8ed7b2734760 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c629882ac73cab2cd41d9948caeed633fc570fc0 +refs/heads/master: b71c7aaa1e2a9858f0c469026098fbd6e046d7bb diff --git a/trunk/drivers/net/stmmac/enh_desc.c b/trunk/drivers/net/stmmac/enh_desc.c index 77ff88c3958b..5d1471d8f8f6 100644 --- a/trunk/drivers/net/stmmac/enh_desc.c +++ b/trunk/drivers/net/stmmac/enh_desc.c @@ -284,7 +284,7 @@ static void enh_desc_release_tx_desc(struct dma_desc *p) { int ter = p->des01.etx.end_ring; - memset(p, 0, sizeof(struct dma_desc)); + memset(p, 0, offsetof(struct dma_desc, des2)); p->des01.etx.end_ring = ter; } diff --git a/trunk/drivers/net/stmmac/norm_desc.c b/trunk/drivers/net/stmmac/norm_desc.c index 51f4440ab98b..0dce90cb8124 100644 --- a/trunk/drivers/net/stmmac/norm_desc.c +++ b/trunk/drivers/net/stmmac/norm_desc.c @@ -174,22 +174,7 @@ static void ndesc_release_tx_desc(struct dma_desc *p) { int ter = p->des01.tx.end_ring; - /* clean field used within the xmit */ - p->des01.tx.first_segment = 0; - p->des01.tx.last_segment = 0; - p->des01.tx.buffer1_size = 0; - - /* clean status reported */ - p->des01.tx.error_summary = 0; - p->des01.tx.underflow_error = 0; - p->des01.tx.no_carrier = 0; - p->des01.tx.loss_carrier = 0; - p->des01.tx.excessive_deferral = 0; - p->des01.tx.excessive_collisions = 0; - p->des01.tx.late_collision = 0; - p->des01.tx.heartbeat_fail = 0; - p->des01.tx.deferred = 0; - + memset(p, 0, offsetof(struct dma_desc, des2)); /* set termination field */ p->des01.tx.end_ring = ter; }