STABLE14-rx-deal-with-afs34-jumbograms-again-20070105

try again at dealing with old jumbograms

(cherry picked from commit 52b036747c78139c5b0a69a934e46ae9f34e0741)

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index b4c4dd91f5ca13d6ca95fe9bb36aaca228e0cb73..5fd3815cf4d1877c6aee68e50f8df34c637abc1c 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -388,13 +388,12 @@ rxi_FreePackets(int num_pkts, struct rx_queue * q)
     osi_Assert(num_pkts >= 0);
     RX_TS_INFO_GET(rx_ts_info);
 
-    if (!num_pkts) {
-       for (queue_Scan(q, c, nc, rx_packet), num_pkts++) {
-           rxi_FreeDataBufsTSFPQ(c, 1, 0);
-       }
-    } else {
-       RX_TS_FPQ_CHECKIN2(rx_ts_info, num_pkts, q);
-    }
+    if (!num_pkts) 
+       queue_Count(q, c, nc, rx_packet, num_pkts);
+
+    if (num_pkts)
+        for (queue_Scan(q, c, nc, rx_packet)) 
+            RX_TS_FPQ_CHECKIN2(rx_ts_info, num_pkts, q);
 
     if (rx_ts_info->_FPQ.len > rx_TSFPQLocalMax) {
         NETPRI;