Module Name: src
Committed By: pooka
Date: Fri Apr 30 21:05:52 UTC 2010
Modified Files:
src/sys/rump/net/rumptest: rumptest_net.c
Log Message:
Remove bpf modload code. With the current state of affairs, the
kernel module either be autoloaded from the host or the kernel
module ABI is not supported on the given arch.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/net/rumptest/rumptest_net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/rumptest/rumptest_net.c
diff -u src/sys/rump/net/rumptest/rumptest_net.c:1.19 src/sys/rump/net/rumptest/rumptest_net.c:1.20
--- src/sys/rump/net/rumptest/rumptest_net.c:1.19 Fri Jan 29 12:34:17 2010
+++ src/sys/rump/net/rumptest/rumptest_net.c Fri Apr 30 21:05:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumptest_net.c,v 1.19 2010/01/29 12:34:17 pooka Exp $ */
+/* $NetBSD: rumptest_net.c,v 1.20 2010/04/30 21:05:52 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -265,38 +265,13 @@
struct bpf_hdr *bhdr;
void *buf;
struct ifreq ifr;
- int bpfd, modfd;
+ int bpfd;
u_int bpflen, x, dlt;
ssize_t n;
bpfd = rump_sys_open("/dev/bpf", O_RDWR);
-
- /* fail? try to load kernel module */
- if (bpfd == -1) {
- modctl_load_t ml;
-
- /* XXX: struct stat size */
- modfd = open("./bpf.kmod", O_RDONLY);
- if (modfd == -1)
- err(1, "no bpf, no bpf kmod");
- close(modfd);
-
- rump_pub_etfs_register("/bpf.kmod",
- "./bpf.kmod", RUMP_ETFS_REG);
- ml.ml_filename = "/bpf.kmod";
- ml.ml_flags = 0;
- ml.ml_props = NULL;
- ml.ml_propslen = 0;
-
- if (rump_sys_modctl(MODCTL_LOAD, &ml) == -1)
- err(1, "load bpf module");
- /* XXX: I "know" it's 256 XXX */
- rump_sys_mknod("/dev/bpf", 0777 | S_IFCHR, makedev(256,0));
-
- bpfd = rump_sys_open("/dev/bpf", O_RDWR);
- if (bpfd == -1)
- err(1, "open bpf");
- }
+ if (bpfd == -1)
+ err(1, "open bpf");
if (rump_sys_ioctl(bpfd, BIOCGBLEN, &bpflen) == -1)
err(1, "BIOCGBLEN");
