PERFORCE change 131479 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=131479

Change 131479 by rwatson at rwatson_cinnamon on 2007/12/23 17:17:13

	Use zero-copy flag instead of non-NULL zero-copy buffer pointer to
	test for zero-copy being enabled.

Affected files ...

.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#11 edit

Differences ...

==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#11 (text+ko) ====

@@ -285,7 +285,7 @@
 	cc = p->cc;
 	if (p->cc == 0) {
 #ifdef BIOCSETBUFMODE
-		if (p->zbuf1 != NULL) {
+		if (p->zerocopy) {
 			if (p->buffer != NULL)
 				pcap_ack_zbuf(p);
 			i = pcap_next_zbuf(p, &cc);
@@ -1141,7 +1141,7 @@
 	}
 	p->bufsize = v;
 #ifdef BIOCSETBUFMODE
-	if (p->zbuf1 == NULL) {
+	if (!p->zerocopy) {
 #endif
 		p->buffer = (u_char *)malloc(p->bufsize);
 		if (p->buffer == NULL) {