 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_fil.c,v 1.18 2010/04/17 21:00:08 darrenr Exp $	*/
+/*	$NetBSD: ip_fil.c,v 1.19 2010/06/01 08:53:20 plunky Exp $	*/
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
+ *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil.c,v 2.133.2.21 2009/12/27 06:55:08 darrenr Exp";
 #endif
 #ifndef	SOLARIS
 #define	SOLARIS	(defined(sun) && (defined(__svr4__) || defined(__SVR4)))
 @@ -699,50 +699,50 @@ fr_info_t *fin;
 	iss_seq_off += 0x00010000;
 	newiss += iss_seq_off;
 	return newiss;
+}
 /* ------------------------------------------------------------------------ */
 /* Function:    fr_nextipid                                                 */
 /* Returns:     int - 0 == success, -1 == error (packet should be droppped) */
 /* Parameters:  fin(I) - pointer to packet information                      */
 /*                                                                          */
 /* Returns the next IPv4 ID to use for this packet.                         */
 /* ------------------------------------------------------------------------ */
-INLINE u_short fr_nextipid(fin)
+EXTERN_INLINE u_short fr_nextipid(fin)
 fr_info_t *fin;
+{
 	static u_short ipid = 0;
 	u_short id;
 	MUTEX_ENTER(&ipf_rw);
 	id = ipid++;
 	MUTEX_EXIT(&ipf_rw);
 	return id;
+}
-INLINE void fr_checkv4sum(fin)
+EXTERN_INLINE void fr_checkv4sum(fin)
 fr_info_t *fin;
+{
 	if (fr_checkl4sum(fin) == -1)
 		fin->fin_flx |= FI_BAD;
+}
 #ifdef	USE_INET6
-INLINE void fr_checkv6sum(fin)
+EXTERN_INLINE void fr_checkv6sum(fin)
 fr_info_t *fin;
+{
 	if (fr_checkl4sum(fin) == -1)
 		fin->fin_flx |= FI_BAD;
+}
 #endif
 /*
  * See above for description, except that all addressing is in user space.
  */
 int copyoutptr(src, dst, size)
 void *src, *dst;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_compat.h,v 1.28 2010/04/17 21:00:44 darrenr Exp $	*/
+/*	$NetBSD: ip_compat.h,v 1.29 2010/06/01 08:53:20 plunky Exp $	*/
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
+ *
  * See the IPFILTER.LICENCE file for details on licencing.
+ *
  * @(#)ip_compat.h	1.8 1/14/96
  * Id: ip_compat.h,v 2.142.2.79 2010/01/31 16:22:54 darrenr Exp
  */
 #ifndef _NETINET_IP_COMPAT_H_
 #define _NETINET_IP_COMPAT_H_
 @@ -1571,26 +1571,34 @@ typedef union {
 #define	ipf_isr		ipf_lkun_s.ipf_sr
 #define	ipf_isw		ipf_lkun_s.ipf_sw
 #define	ipf_magic	ipf_lkun_s.ipf_magic
 #if !defined(__GNUC__) || \
     (defined(__FreeBSD_version) && (__FreeBSD_version >= 503000))
 # ifndef	INLINE
 #  define	INLINE
 # endif
 #else
 # define	INLINE	__inline__
 #endif
 #ifndef EXTERN_INLINE
 # if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
 #  define	EXTERN_INLINE	inline
 # else
 #  define	EXTERN_INLINE	extern inline
 # endif
 #endif
 #if defined(linux) && defined(_KERNEL)
 extern	void	ipf_read_enter __P((ipfrwlock_t *));
 extern	void	ipf_write_enter __P((ipfrwlock_t *));
 extern	void	ipf_rw_exit __P((ipfrwlock_t *));
 extern	void	ipf_rw_init __P((ipfrwlock_t *, char *));
 extern	void	ipf_rw_downgrade __P((ipfrwlock_t *));
 #endif
 /*
  * In a non-kernel environment, there are a lot of macros that need to be
  * filled in to be null-ops or to point to some compatibility function,
  * somewhere in userland.
  */

 @@ -1,24 +1,24 @@
-/*	$NetBSD: ip_fil_netbsd.c,v 1.54 2010/04/17 21:00:44 darrenr Exp $	*/
+/*	$NetBSD: ip_fil_netbsd.c,v 1.55 2010/06/01 08:53:20 plunky Exp $	*/
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
+ *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.54 2010/04/17 21:00:44 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.55 2010/06/01 08:53:20 plunky Exp $");
 #else
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 2.55.2.67 2009/12/19 05:41:08 darrenr Exp";
 #endif
 #endif
 #if defined(KERNEL) || defined(_KERNEL)
 # undef KERNEL
 # undef _KERNEL
 # define        KERNEL	1
 # define        _KERNEL	1
 #endif
 #include <sys/param.h>
 @@ -1807,27 +1807,27 @@ fr_info_t *fin;
 u_short fr_nextipid(fr_info_t *fin)
+{
 	static u_short ipid = 0;
 	u_short id;
 	MUTEX_ENTER(&ipf_rw);
 	id = ipid++;
 	MUTEX_EXIT(&ipf_rw);
 	return id;
+}
-INLINE void fr_checkv4sum(fin)
+EXTERN_INLINE void fr_checkv4sum(fin)
 fr_info_t *fin;
+{
 #ifdef M_CSUM_TCP_UDP_BAD
 	int manual, pflag, cflags, active;
 	mb_t *m;
 	if ((fin->fin_flx & FI_NOCKSUM) != 0)
 		return;
 	if (fin->fin_cksum != 0)
 		return;
 	manual = 0;
 @@ -1881,27 +1881,27 @@ skipauto:
 # else
+	;
 # endif
 #else
 # ifdef IPFILTER_CKSUM
 	if (fr_checkl4sum(fin) == -1)
 		fin->fin_flx |= FI_BAD;
 # endif
 #endif
+}
 #ifdef USE_INET6
-INLINE void fr_checkv6sum(fin)
+EXTERN_INLINE void fr_checkv6sum(fin)
 fr_info_t *fin;
+{
 # ifdef M_CSUM_TCP_UDP_BAD
 	int manual, pflag, cflags, active;
 	mb_t *m;
 	if ((fin->fin_flx & FI_NOCKSUM) != 0)
 		return;
 	manual = 0;
 	m = fin->fin_m;
 	switch (fin->fin_p)