From owner-p4-projects@FreeBSD.ORG  Wed Feb  7 11:22:33 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2964616A402; Wed,  7 Feb 2007 11:22:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EAC5E16A400
	for <perforce@freebsd.org>; Wed,  7 Feb 2007 11:22:31 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id D9E0813C49D
	for <perforce@freebsd.org>; Wed,  7 Feb 2007 11:22:31 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l17BMVM7051870
	for <perforce@freebsd.org>; Wed, 7 Feb 2007 11:22:31 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17BMVro051864
	for perforce@freebsd.org; Wed, 7 Feb 2007 11:22:31 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 7 Feb 2007 11:22:31 GMT
Message-Id: <200702071122.l17BMVro051864@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114169 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Feb 2007 11:22:34 -0000

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

Change 114169 by rwatson@rwatson_cinnamon on 2007/02/07 11:22:22

	Alphabetize.

Affected files ...

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

Differences ...

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

@@ -310,41 +310,41 @@
 }
 
 static int
-bpf_ioctl_rotate(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz)
+bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz)
 {
 
 	if (d->bd_bufmode != BPF_BUFMODE_ZBUF)
 		return (EOPNOTSUPP);
 #ifdef BPF_ZEROCOPY
-	return (bpf_zerocopy_ioctl_rotate(td, d, bz));
+	return (bpf_zerocopy_ioctl_getznext(td, d, bz));
 #else
-	panic("bpf_ioctl_rotate");
+	panic("bpf_ioctl_getznext");
 #endif
 }
 
 static int
-bpf_ioctl_getznext(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz)
+bpf_ioctl_getzmax(struct thread *td, struct bpf_d *d, size_t *i)
 {
 
 	if (d->bd_bufmode != BPF_BUFMODE_ZBUF)
 		return (EOPNOTSUPP);
 #ifdef BPF_ZEROCOPY
-	return (bpf_zerocopy_ioctl_getznext(td, d, bz));
+	return (bpf_zerocopy_ioctl_getzmax(td, d, i));
 #else
-	panic("bpf_ioctl_getznext");
+	panic("bpf_ioctl_getzmax");
 #endif
 }
 
 static int
-bpf_ioctl_getzmax(struct thread *td, struct bpf_d *d, size_t *i)
+bpf_ioctl_rotate(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz)
 {
 
 	if (d->bd_bufmode != BPF_BUFMODE_ZBUF)
 		return (EOPNOTSUPP);
 #ifdef BPF_ZEROCOPY
-	return (bpf_zerocopy_ioctl_getzmax(td, d, i));
+	return (bpf_zerocopy_ioctl_rotate(td, d, bz));
 #else
-	panic("bpf_ioctl_getzmax");
+	panic("bpf_ioctl_rotate");
 #endif
 }
 

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

@@ -51,10 +51,10 @@
 	    size_t *i);
 int	bpf_zerocopy_ioctl_getznext(struct thread *td, struct bpf_d *d,
 	    struct bpf_zbuf *bz);
+int	bpf_zerocopy_ioctl_rotate(struct thread *td, struct bpf_d *d,
+	    struct bpf_zbuf *bz);
 int	bpf_zerocopy_ioctl_setzbuf(struct thread *td, struct bpf_d *d,
 	    struct bpf_zbuf *bz);
 int	bpf_zerocopy_uiomove(struct bpf_d *d, caddr_t buf, u_int len,
 	    struct uio *uio);
-int	bpf_zerocopy_ioctl_rotate(struct thread *td, struct bpf_d *d,
-	    struct bpf_zbuf *bz);
 #endif /* !_NET_BPF_ZEROCOPY_H_ */