Module Name: src
Committed By: mrg
Date: Sun Dec 5 09:42:21 UTC 2010
Modified Files:
src/sys/net: bpf_filter.c
Log Message:
consider BPF_ABS, BPF_IND and BPF_MSH as they used to be in rev 1.37.
this fixes dhclient, and i'm told dhcpcd as well.
this patch from [email protected], tested by me.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/net/bpf_filter.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/net/bpf_filter.c
diff -u src/sys/net/bpf_filter.c:1.39 src/sys/net/bpf_filter.c:1.40
--- src/sys/net/bpf_filter.c:1.39 Sun Dec 5 08:45:46 2010
+++ src/sys/net/bpf_filter.c Sun Dec 5 09:42:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf_filter.c,v 1.39 2010/12/05 08:45:46 mrg Exp $ */
+/* $NetBSD: bpf_filter.c,v 1.40 2010/12/05 09:42:20 mrg Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.39 2010/12/05 08:45:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.40 2010/12/05 09:42:20 mrg Exp $");
#if 0
#if !(defined(lint) || defined(KERNEL))
@@ -484,11 +484,7 @@
case BPF_LD:
case BPF_LDX:
switch (BPF_MODE(p->code)) {
- case BPF_IMM:
- break;
- case BPF_ABS:
- case BPF_IND:
- case BPF_MSH:
+ case BPF_MEM:
/*
* There's no maximum packet data size
* in userland. The runtime packet length
@@ -503,10 +499,10 @@
return 0;
#endif
break;
- case BPF_MEM:
- if (p->k >= BPF_MEMWORDS)
- return 0;
- break;
+ case BPF_ABS:
+ case BPF_IND:
+ case BPF_MSH:
+ case BPF_IMM:
case BPF_LEN:
break;
default:
