From owner-p4-projects@FreeBSD.ORG Wed Feb 7 16:02:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A7A916A404; Wed, 7 Feb 2007 16:02:23 +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 1B56E16A400 for ; Wed, 7 Feb 2007 16:02:23 +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 F403D13C4AA for ; Wed, 7 Feb 2007 16:02:22 +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 l17G2MKn095605 for ; Wed, 7 Feb 2007 16:02:22 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 l17G2MOf095602 for perforce@freebsd.org; Wed, 7 Feb 2007 16:02:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 7 Feb 2007 16:02:22 GMT Message-Id: <200702071602.l17G2MOf095602@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 114178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Feb 2007 16:02:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=114178 Change 114178 by rwatson@rwatson_cinnamon on 2007/02/07 16:01:37 Rename bpf_ioctl_rotate to bpf_ioctl_rotzbuf in order to match the ioctl constant name. Discussed with: csjp Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#18 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#19 edit .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#8 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#18 (text+ko) ==== @@ -336,15 +336,15 @@ } static int -bpf_ioctl_rotate(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) +bpf_ioctl_rotzbuf(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_rotzbuf(td, d, bz)); #else - panic("bpf_ioctl_rotate"); + panic("bpf_ioctl_rotzbuf"); #endif } @@ -1298,7 +1298,7 @@ return (bpf_ioctl_setzbuf(td, d, (struct bpf_zbuf *)addr)); case BIOCROTZBUF: - return (bpf_ioctl_rotate(td, d, (struct bpf_zbuf *) addr)); + return (bpf_ioctl_rotzbuf(td, d, (struct bpf_zbuf *)addr)); } return (error); } ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#19 (text+ko) ==== @@ -579,7 +579,7 @@ } int -bpf_zerocopy_ioctl_rotate(struct thread *td, struct bpf_d *d, +bpf_zerocopy_ioctl_rotzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) { struct zbuf *bzh; ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.h#8 (text+ko) ==== @@ -51,7 +51,7 @@ 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, +int bpf_zerocopy_ioctl_rotzbuf(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);