]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
STABLE14-kill-rxglock-20050413
authorChas Williams <chas@cmf.nrl.navy.mil>
Thu, 14 Apr 2005 05:23:14 +0000 (05:23 +0000)
committerDerrick Brashear <shadow@dementia.org>
Thu, 14 Apr 2005 05:23:14 +0000 (05:23 +0000)
FIXES 18222

the rxglock was being defined out by all the platforms, just kill it.

(cherry picked from commit cffa1571bb7122cdd5fc18251685af5a3c5cbaaa)

src/rx/rx_packet.c

index 5472f37f95da4fe7645279a76bc330ace4fac60e..d7dc99318e3d1d6ecedebf9dbe73d28343e12845 100644 (file)
@@ -463,14 +463,12 @@ rxi_MorePackets(int apackets)
 
     if (rx_ts_info->_FPQ.len > rx_TSFPQLocalMax) {
         NETPRI;
-       AFS_RXGLOCK();
        MUTEX_ENTER(&rx_freePktQ_lock);
 
        RX_TS_FPQ_LTOG(rx_ts_info);
        rxi_NeedMorePackets = FALSE;
        rxi_PacketsUnWait();
 
-       AFS_RXGUNLOCK();
        MUTEX_EXIT(&rx_freePktQ_lock);
        USERPRI;
     }
@@ -534,14 +532,12 @@ rxi_MorePacketsTSFPQ(int apackets, int flush_global, int num_keep_local)
     if (flush_global && 
         (num_keep_local < apackets)) {
         NETPRI;
-       AFS_RXGLOCK();
        MUTEX_ENTER(&rx_freePktQ_lock);
 
        RX_TS_FPQ_LTOG2(rx_ts_info, (apackets - num_keep_local));
        rxi_NeedMorePackets = FALSE;
        rxi_PacketsUnWait();
 
-       AFS_RXGUNLOCK();
        MUTEX_EXIT(&rx_freePktQ_lock);
        USERPRI;
     }