---

yaml --- r: 276956 b: refs/heads/master c: a03ffcf h: refs/heads/master v: v3
git-mirror · Dec 19, 2011 · fbf5df7 · fbf5df7
1 parent 52066c3
commit fbf5df7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1388dacbbb1d1b2bc208a4ba18de9316dc49ce9
+refs/heads/master: a03ffcf873fe0f2565386ca8ef832144c42e67fa
diff --git a/trunk/arch/x86/net/bpf_jit_comp.c b/trunk/arch/x86/net/bpf_jit_comp.c
@@ -568,8 +568,8 @@ cond_branch:			f_offset = addrs[i + filter[i].jf] - addrs[i];
 					break;
 				}
 				if (filter[i].jt != 0) {
-					if (filter[i].jf)
-						t_offset += is_near(f_offset) ? 2 : 6;
+					if (filter[i].jf && f_offset)
+						t_offset += is_near(f_offset) ? 2 : 5;
 					EMIT_COND_JMP(t_op, t_offset);
 					if (filter[i].jf)
 						EMIT_JMP(f_offset);