STABLE14-tsfpq-macro-naming-20070105

rename the queue-splicing versions of the checkin/checkout macros

(cherry picked from commit cbba8d8b887957122c1870f8a5a4a823af889d0f)

diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h
index 8a24ea41b5179dd67007ba243ca01a5b82f531b2..7874adb840612ceaa261151aaf200775cda886f1 100644 (file)
--- a/src/rx/rx_globals.h
+++ b/src/rx/rx_globals.h
@@ -344,7 +344,7 @@ EXT void rxi_FlushLocalPacketsTSFPQ(void); /* flush all thread-local packets to
         (rx_ts_info_p)->_FPQ.checkout_xfer++; \
     } while(0)
 /* checkout multiple packets from the thread-specific free packet queue */
-#define RX_TS_FPQ_CHECKOUT2(rx_ts_info_p,num_transfer,q) \
+#define RX_TS_FPQ_QCHECKOUT(rx_ts_info_p,num_transfer,q) \
     do { \
         register int i; \
         register struct rx_packet *p; \
@@ -371,7 +371,7 @@ EXT void rxi_FlushLocalPacketsTSFPQ(void); /* flush all thread-local packets to
 /* num_transfer must equal length of (q); it is not a means of checking 
  * in part of (q).  passing num_transfer just saves us instructions 
  * since caller already knows length of (q) for other reasons */
-#define RX_TS_FPQ_CHECKIN2(rx_ts_info_p,num_transfer,q) \
+#define RX_TS_FPQ_QCHECKIN(rx_ts_info_p,num_transfer,q) \
     do { \
         register struct rx_packet *p, *np; \
         for (queue_Scan((q), p, np, rx_packet)) { \

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index 5fd3815cf4d1877c6aee68e50f8df34c637abc1c..f1410488d57d5ad2b92f66c91fafdaae5532ad86 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -297,7 +297,7 @@ AllocPacketBufs(int class, int num_pkts, struct rx_queue * q)
        USERPRI;
     }
 
-    RX_TS_FPQ_CHECKOUT2(rx_ts_info, num_pkts, q);
+    RX_TS_FPQ_QCHECKOUT(rx_ts_info, num_pkts, q);
 
     return num_pkts;
 }
@@ -393,7 +393,7 @@ rxi_FreePackets(int num_pkts, struct rx_queue * q)
 
     if (num_pkts)
         for (queue_Scan(q, c, nc, rx_packet)) 
-            RX_TS_FPQ_CHECKIN2(rx_ts_info, num_pkts, q);
+            RX_TS_FPQ_QCHECKIN(rx_ts_info, num_pkts, q);
 
     if (rx_ts_info->_FPQ.len > rx_TSFPQLocalMax) {
         NETPRI;