=== FIX BUILD LOG === --- Apply fix.diff --- Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/sys/netgraph7/ether/ng_ether.c b/sys/netgraph7/ether/ng_ether.c |--- a/sys/netgraph7/ether/ng_ether.c |+++ b/sys/netgraph7/ether/ng_ether.c -------------------------- Patching file sys/netgraph7/ether/ng_ether.c using Plan A... Ignoring previously applied (or reversed) patch. Hunk #1 ignored at 655. 1 out of 1 hunks ignored--saving rejects to sys/netgraph7/ether/ng_ether.c.rej done --- Verify fix in source --- 658: m = bridge_input_p(ifp, m); --- Build patched ng_ether.ko module --- Warning: Object directory not changed from original /usr/src/sys/netgraph7/ether cc -O2 -pipe -D_KERNEL -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual -Wold-style-definition -Wmissing-include-dirs -Wno-pointer-sign -Winit-self -Wundef -Wno-unused-but-set-variable -std=gnu11 -Werror -DKLD_MODULE -nostdinc -I. -Idragonfly -I/usr/src/sys/netgraph7/ether/forwarder_x86_64/include -Idragonfly/../include -Wold-style-declaration -fno-common -ffreestanding -fno-stack-protector -fno-strict-aliasing -fno-strict-overflow -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float -mno-fp-ret-in-387 -mindirect-branch=thunk-inline -c ng_ether.c cc -Wl,--build-id=sha1 -nostdlib -Wl,--hash-style=sysv -r -Wl,-d -o ng_ether.ko ng_ether.o --- Module location --- -rw-r--r-- 1 root 1000 12560 Jul 3 02:24 ng_ether.ko === UNPATCHED vs PATCHED disassembly comparison === --- UNPATCHED (buggy: return value discarded) --- 60f: 4c 89 e7 mov %r12,%rdi 612: e8 00 00 00 00 callq 617 613: R_X86_64_PLT32 bridge_input_p-0x4 617: 48 89 de mov %rbx,%rsi 61a: 4c 89 e7 mov %r12,%rdi 61d: e8 00 00 00 00 callq 622 61e: R_X86_64_PLT32 ether_demux_oncpu-0x4 622: 31 c0 xor %eax,%eax 624: 48 83 c4 18 add $0x18,%rsp 628: 5b pop %rbx 629: 41 5c pop %r12 62b: 41 5d pop %r13 62d: 5d pop %rbp 62e: c3 retq 62f: 90 nop --- PATCHED (fixed: m = bridge_input_p captured) --- 613: 4c 89 e7 mov %r12,%rdi 616: e8 00 00 00 00 callq 61b 617: R_X86_64_PLT32 bridge_input_p-0x4 61b: 48 89 c3 mov %rax,%rbx 61e: 48 85 c0 test %rax,%rax 621: 0f 84 ca 00 00 00 je 6f1 627: 48 89 de mov %rbx,%rsi 62a: 4c 89 e7 mov %r12,%rdi 62d: e8 00 00 00 00 callq 632 62e: R_X86_64_PLT32 ether_demux_oncpu-0x4 632: 31 c0 xor %eax,%eax 634: 48 83 c4 18 add $0x18,%rsp 638: 5b pop %rbx 639: 41 5c pop %r12 63b: 41 5d pop %r13 === Patched module sha256 === SHA256 (ng_ether.ko) = 04e697f1507d7fd5b024e3581d3f0f6b1f209b3d5d84bbf58dea9bedd5f1c317