compilation fixes for PF_RING and IPFW after removal of mutex_pending

remotes/origin/master-1.0.x
William Metcalf 16 years ago committed by Victor Julien
parent c2fb90c745
commit 54da99fe53

@ -244,13 +244,6 @@ TmEcode ReceiveIPFW(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq) {
SCLogDebug("Received Packet Len: %d",pktlen);
/* Is the packet queue full, wait if so */
SCMutexLock(&mutex_pending);
if (pending > max_pending_packets) {
pthread_cond_wait(&cond_pending, &mutex_pending);
}
SCMutexUnlock(&mutex_pending);
/* Setup packet */
p = tv->tmqh_in(tv);

@ -161,13 +161,6 @@ void PfringProcessPacket(void *user, struct pfring_pkthdr *h, u_char *pkt, Packe
//TmqDebugList();
//printf("PfringProcessPacket: pending %" PRIu32 "\n", pending);
/* We need this otherwise the other queues can't seem to keep up on busy networks */
SCMutexLock(&mutex_pending);
if (pending > max_pending_packets) {
SCondWait(&cond_pending, &mutex_pending);
}
SCMutexUnlock(&mutex_pending);
p->ts.tv_sec = h->ts.tv_sec;
p->ts.tv_usec = h->ts.tv_usec;

Loading…
Cancel
Save