free-packet-avoid-issue-with-34-jumbograms-20070104

try to deal with rainer toebbicke's ongoing issue

diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h
index 73671984339bca5d70f67c7fe113ed5a156bbdbf..f268153eccc250945a786cdbf4496bdd73157be5 100644 (file)
--- a/src/rx/rx_globals.h
+++ b/src/rx/rx_globals.h
@@ -202,6 +202,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 64b79f108318c82254cf1b2178ca504f4ca4d87b..3ab23e0a48126414adfecfa72c314a7741821142 100644 (file)
--- 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);
     }