thorpej 5b0d69d6a8 In ipl_disable(), don't conditionalize the "fr_checkp = fr_savep" ...

operation, since:
	- in ipl_enable(), "fr_savep = fr_checkp" is not conditionalized
	  in the same way (not at all), and
	- without this change, it was not possible to enable, disable,
	  and reenable ipfilter.

1997-06-01 06:57:09 +00:00

..

fil.c

Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some

1997-05-28 00:17:11 +00:00

icmp_var.h

…

if_arp.c

Allow revarpwhoami() to be called multiple times.

1997-05-27 23:14:44 +00:00

if_atm.c

…

if_atm.h

…

if_inarp.h

…

igmp_var.h

…

igmp.c

…

igmp.h

…

in_cksum.c

…

in_pcb.c

…

in_pcb.h

…

in_proto.c

…

in_systm.h

…

in_var.h

…

in.c

…

in.h

…

ip_compat.h

Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some

1997-05-28 00:17:11 +00:00

ip_fil.c

In ipl_disable(), don't conditionalize the "fr_checkp = fr_savep"

1997-06-01 06:57:09 +00:00

ip_fil.h

Put the #ifndef _KERNEL prototype of get_unit() in <netinet/ip_fil.h>

1997-05-28 04:48:47 +00:00

ip_frag.c

Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some

1997-05-28 00:17:11 +00:00

ip_frag.h

Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some

1997-05-28 00:17:11 +00:00

ip_ftp_pxy.c

Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some

1997-05-28 00:17:11 +00:00

ip_icmp.c

…

ip_icmp.h

…

ip_input.c

…

ip_mroute.c

…

ip_mroute.h

…

ip_nat.c

Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some

1997-05-28 00:17:11 +00:00

ip_nat.h

Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some

1997-05-28 00:17:11 +00:00

ip_output.c

…

ip_proxy.c

Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some

1997-05-28 00:17:11 +00:00

ip_proxy.h

Change the aps_tout member of struct ap_session from time_t to u_long

1997-05-28 04:59:34 +00:00

ip_state.c

Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some

1997-05-28 00:17:11 +00:00

ip_state.h

Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some

1997-05-28 00:17:11 +00:00

ip_var.h

…

ip.h

…

raw_ip.c

…

tcp_debug.c

…

tcp_debug.h

…

tcp_fsm.h

…

tcp_input.c

…

tcp_output.c

…

tcp_seq.h

…

tcp_subr.c

…

tcp_timer.c

…

tcp_timer.h

…

tcp_usrreq.c

…

tcp_var.h

…

tcp.h

…

tcpip.h

…

udp_usrreq.c

…

udp_var.h

…

udp.h

…