Module Name: src
Committed By: ozaki-r
Date: Mon Jan 23 10:17:36 UTC 2017
Modified Files:
src/sys/net: bpf.c bpfdesc.h
Log Message:
Make bpf_setf static
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/net/bpf.c
cvs rdiff -u -r1.38 -r1.39 src/sys/net/bpfdesc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.203 src/sys/net/bpf.c:1.204
--- src/sys/net/bpf.c:1.203 Tue Jul 19 02:47:45 2016
+++ src/sys/net/bpf.c Mon Jan 23 10:17:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.203 2016/07/19 02:47:45 pgoyette Exp $ */
+/* $NetBSD: bpf.c,v 1.204 2017/01/23 10:17:36 ozaki-r Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.203 2016/07/19 02:47:45 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.204 2017/01/23 10:17:36 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -144,6 +144,7 @@ static int bpf_movein(struct uio *, int,
static void bpf_attachd(struct bpf_d *, struct bpf_if *);
static void bpf_detachd(struct bpf_d *);
static int bpf_setif(struct bpf_d *, struct ifreq *);
+static int bpf_setf(struct bpf_d *, struct bpf_program *);
static void bpf_timed_out(void *);
static inline void
bpf_wakeup(struct bpf_d *);
@@ -1101,7 +1102,7 @@ bpf_ioctl(struct file *fp, u_long cmd, v
* Set d's packet filter program to fp. If this file already has a filter,
* free it and replace it. Returns EINVAL for bogus requests.
*/
-int
+static int
bpf_setf(struct bpf_d *d, struct bpf_program *fp)
{
struct bpf_insn *fcode, *old;
Index: src/sys/net/bpfdesc.h
diff -u src/sys/net/bpfdesc.h:1.38 src/sys/net/bpfdesc.h:1.39
--- src/sys/net/bpfdesc.h:1.38 Fri Nov 15 00:12:44 2013
+++ src/sys/net/bpfdesc.h Mon Jan 23 10:17:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bpfdesc.h,v 1.38 2013/11/15 00:12:44 rmind Exp $ */
+/* $NetBSD: bpfdesc.h,v 1.39 2017/01/23 10:17:36 ozaki-r Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -141,8 +141,4 @@ struct bpf_if {
struct ifnet *bif_ifp; /* corresponding interface */
};
-#ifdef _KERNEL
-int bpf_setf(struct bpf_d *, struct bpf_program *);
-#endif
-
#endif /* !_NET_BPFDESC_H_ */
