From a85614b42b2c411f521e0b284467f556c4e33cca Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sat, 27 Jan 2007 18:12:50 +0000 Subject: [PATCH] Remove BSD < 199103 compatibility entries in the bpf_d structure: they are not used in any of our code. Also remove explicit padding variable that kept the bpf_d structure the same size before and after the change in select implementation, since binary compatibility is not required for this data structure on 7-CURRENT. --- sys/net/bpfdesc.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h index de1557a0ebe8..a48590d0b3c7 100644 --- a/sys/net/bpfdesc.h +++ b/sys/net/bpfdesc.h @@ -85,14 +85,7 @@ struct bpf_d { int bd_async; /* non-zero if packet reception should generate signal */ int bd_sig; /* signal to send upon packet reception */ struct sigio * bd_sigio; /* information for async I/O */ -#if BSD < 199103 - u_char bd_selcoll; /* true if selects collide */ - int bd_timedout; - struct thread * bd_selthread; /* process that last selected us */ -#else - u_char bd_pad; /* explicit alignment */ struct selinfo bd_sel; /* bsd select info */ -#endif struct mtx bd_mtx; /* mutex for this descriptor */ struct callout bd_callout; /* for BPF timeouts with select */ struct label *bd_label; /* MAC label for descriptor */