As per the developers handbook (5.3.1 step 1), prepare the vendor trees for

import of new ipfilter vendor sources by flattening them.

To keep the tags consistent with dist, the tags are also flattened.

Approved by:	glebius (Mentor)

1 files changed, 0 insertions, 32 deletions

diff --git a/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs b/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs
deleted file mode 100644
index c2b2b15..0000000
--- a/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs
+++ /dev/null
@@ -1,32 +0,0 @@
-*** /sys/netinet/ip_input.c.orig	Sat May 24 13:37:16 1997
---- /sys/netinet/ip_input.c	Sat May 24 13:38:58 1997
-***************
-*** 74,79 ****
---- 74,82 ----
-  #ifdef IPFIREWALL
-  #include <netinet/ip_fw.h>
-  #endif
-+ #if defined(IPFILTER_LKM) || defined(IPFILTER)
-+ int	(*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **));
-+ #endif
-  
-  int rsvp_on = 0;
-  static int ip_rsvp_on;
-***************
-*** 310,315 ****
---- 313,327 ----
-  	 * - Wrap: fake packet's addr/port <unimpl.>
-  	 * - Encapsulate: put it in another IP and send out. <unimp.>
-   	 */
-+ #if defined(IPFILTER_LKM) || defined(IPFILTER)
-+ 	if (fr_checkp) {
-+ 		struct mbuf *m1 = m;
-+ 
-+ 		if ((*fr_checkp)(ip, hlen, m->m_pkthdr.rcvif, 0, &m1) || !m1)
-+ 			return;
-+ 		ip = mtod(m = m1, struct ip *);
-+ 	}
-+ #endif
-  
-  #ifdef COMPAT_IPFW
-  	if (ip_fw_chk_ptr) {