PERFORCE change 132793 for review

[Robert Watson]

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

Change 132793 by rwatson at rwatson_fledge on 2008/01/08 15:38:40

	More re-merging of new BPF contents since original integration in
	order to reduce differences.

Affected files ...

.. //depot/projects/zcopybpf/src/sys/net/bpf.h#17 edit

Differences ...

==== //depot/projects/zcopybpf/src/sys/net/bpf.h#17 (text+ko) ====

@@ -123,13 +123,6 @@
 	size_t	 bz_buflen;	/* Size of zero-copy buffers. */
 };
 
-/* Packet directions */
-enum bpf_direction {
-        BPF_D_IN,       /* See incoming packets */
-        BPF_D_INOUT,    /* See incoming and outgoing packets */
-        BPF_D_OUT       /* See outgoing packets */
-};
-
 #define	BIOCGBLEN	_IOR('B',102, u_int)
 #define	BIOCSBLEN	_IOWR('B',102, u_int)
 #define	BIOCSETF	_IOW('B',103, struct bpf_program)
@@ -167,6 +160,13 @@
 #define	BIOCSETZBUF	_IOW('B', 131, struct bpf_zbuf)
 #define	BIOCFEEDBACK	_IOW('B', 132, u_int)
 
+/* Packet directions */
+enum bpf_direction {
+        BPF_D_IN,       /* See incoming packets */
+        BPF_D_INOUT,    /* See incoming and outgoing packets */
+        BPF_D_OUT       /* See outgoing packets */
+};
+
 /*
  * Structure prepended to each packet.
  */