thorpej f30d8f327f Resolve conflicts from merge. ... XXX !!! XXX !!! I noticed a few semi-serious bugs while doing this merge, one of which has existed for a fairly long time. Some of them are addressed in this commit (because they caused the kernel to not compile), and are annoted by "XXX" and "--thorpej". The other one will be addressed shortly in a future commit, and, as far as I can tell, affects all operating systems which IP Filter supports.		1997-03-29 00:54:55 +00:00
..
fil.c	Resolve conflicts from merge.	1997-03-29 00:54:55 +00:00
icmp_var.h
if_arp.c	Fix several bugs related to the new ARP code, and ARCnet ARP support.	1997-03-23 01:22:35 +00:00
if_atm.c
if_atm.h
if_inarp.h	New ARP system, supports IPv4 over any hardware link.	1997-03-15 18:09:08 +00:00
igmp_var.h
igmp.c
igmp.h
in_cksum.c
in_pcb.c	Return EAGAIN if binding with no specified port and the pool is empty.	1996-12-10 11:38:42 +00:00
in_pcb.h	Implement the IP_RECVIF socket option: supply a datagram packet's incoming	1997-01-11 05:21:07 +00:00
in_proto.c
in_systm.h
in_var.h
in.c	New ARP system, supports IPv4 over any hardware link.	1997-03-15 18:09:08 +00:00
in.h	Add net.inet.ip.allowsrcrt option which allows/drops all source	1997-02-25 08:35:41 +00:00
ip_compat.h	Resolve conflicts from merge.	1997-03-29 00:54:55 +00:00
ip_fil.c	Resolve conflicts from merge.	1997-03-29 00:54:55 +00:00
ip_fil.h	Resolve conflicts from merge.	1997-03-29 00:54:55 +00:00
ip_frag.c	Resolve conflicts from merge.	1997-03-29 00:54:55 +00:00
ip_frag.h	Resolve conflicts from merge.	1997-03-29 00:54:55 +00:00
ip_icmp.c
ip_icmp.h
ip_input.c	allow src-routed packetd by default, per host requirements	1997-02-26 04:09:32 +00:00
ip_mroute.c
ip_mroute.h
ip_nat.c	Resolve conflicts from merge.	1997-03-29 00:54:55 +00:00
ip_nat.h	Resolve conflicts from merge.	1997-03-29 00:54:55 +00:00
ip_output.c	pseudo-device ipfilter brings in PFIL_HOOKS.	1997-02-18 20:49:32 +00:00
ip_state.c	Resolve conflicts from merge.	1997-03-29 00:54:55 +00:00
ip_state.h	Resolve conflicts from merge.	1997-03-29 00:54:55 +00:00
ip_var.h	Implement the IP_RECVIF socket option: supply a datagram packet's incoming	1997-01-11 05:21:07 +00:00
ip.h	Minor change to a comment.	1996-12-11 01:55:50 +00:00
raw_ip.c	Implement the IP_RECVIF socket option: supply a datagram packet's incoming	1997-01-11 05:21:07 +00:00
tcp_debug.c
tcp_debug.h
tcp_fsm.h
tcp_input.c	Fix RTT scaling problems introduced with Brakmo and Peterson changes.	1996-12-10 18:20:19 +00:00
tcp_output.c	Fix RTT scaling problems introduced with Brakmo and Peterson changes.	1996-12-10 18:20:19 +00:00
tcp_seq.h
tcp_subr.c	Fix RTT scaling problems introduced with Brakmo and Peterson changes.	1996-12-10 18:20:19 +00:00
tcp_timer.c	Fix RTT scaling problems introduced with Brakmo and Peterson changes.	1996-12-10 18:20:19 +00:00
tcp_timer.h
tcp_usrreq.c
tcp_var.h	Fix RTT scaling problems introduced with Brakmo and Peterson changes.	1996-12-10 18:20:19 +00:00
tcp.h
tcpip.h
udp_usrreq.c	Implement the IP_RECVIF socket option: supply a datagram packet's incoming	1997-01-11 05:21:07 +00:00
udp_var.h
udp.h	Make length and offset fields unsigned. From Kevin M. Lahey <kml@nas.nasa.gov>	1996-10-25 06:22:24 +00:00