From 1d6e7f50675fdfb4a51fb2aba6be450921a3f3f5 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 5 Jan 2007 04:58:55 +0000
Subject: [PATCH] STABLE14-free-packet-avoid-issue-with-34-jumbograms-20070104

try to deal with rainer toebbicke's ongoing issue


(cherry picked from commit fd4a1c1c32c01a44ee09854039b81b0afa0ded32)
---
 src/rx/rx_globals.h | 2 ++
 src/rx/rx_packet.c  | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h
index 4317a24ad9..8a24ea41b5 100644
--- a/src/rx/rx_globals.h
+++ b/src/rx/rx_globals.h
@@ -201,6 +201,8 @@ EXT struct rx_queue rx_freePacketQueue;
         if ((p)->flags & RX_PKTFLAG_FREE) \
             osi_Panic("rx packet already free\n"); \
         (p)->flags |= RX_PKTFLAG_FREE; \
+        (p)->length = 0; \
+        (p)->niovecs = 0; \
     } while(0)
 #define RX_FPQ_MARK_USED(p) \
     do { \
diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index 9153f30d02..b4c4dd91f5 100644
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -393,12 +393,6 @@ rxi_FreePackets(int num_pkts, struct rx_queue * q)
 	    rxi_FreeDataBufsTSFPQ(c, 1, 0);
 	}
     } else {
-	for (queue_Scan(q, c, nc, rx_packet)) {
-	    rxi_FreeDataBufsTSFPQ(c, 1, 0);
-	}
-    }
-
-    if (num_pkts) {
 	RX_TS_FPQ_CHECKIN2(rx_ts_info, num_pkts, q);
     }