svn commit: r278868 - in head/sys: net netpfil/pf

[Gleb Smirnoff]

Author: glebius
Date: Mon Feb 16 21:52:28 2015
New Revision: 278868
URL: https://svnweb.freebsd.org/changeset/base/278868

Log:
  Toss declarations to fix regular build and NO_INET6 build.

Modified:
  head/sys/net/pfvar.h
  head/sys/netpfil/pf/pf_norm.c

Modified: head/sys/net/pfvar.h
==============================================================================
--- head/sys/net/pfvar.h	Mon Feb 16 21:35:29 2015	(r278867)
+++ head/sys/net/pfvar.h	Mon Feb 16 21:52:28 2015	(r278868)
@@ -1574,7 +1574,7 @@ int	pf_test6(int, struct ifnet *, struct
 void	pf_poolmask(struct pf_addr *, struct pf_addr*,
 	    struct pf_addr *, struct pf_addr *, u_int8_t);
 void	pf_addr_inc(struct pf_addr *, sa_family_t);
-int	pf_refragment6(struct ifnet *ifp, struct mbuf **m0, struct m_tag *mtag);
+int	pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *);
 #endif /* INET6 */
 
 u_int32_t	pf_new_isn(struct pf_state *);
@@ -1589,7 +1589,6 @@ int	pf_match_addr_range(struct pf_addr *
 int	pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t);
 
 void	pf_normalize_init(void);
-int	pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *mtag);
 void	pf_normalize_cleanup(void);
 int	pf_normalize_ip(struct mbuf **, int, struct pfi_kif *, u_short *,
 	    struct pf_pdesc *);

Modified: head/sys/netpfil/pf/pf_norm.c
==============================================================================
--- head/sys/netpfil/pf/pf_norm.c	Mon Feb 16 21:35:29 2015	(r278867)
+++ head/sys/netpfil/pf/pf_norm.c	Mon Feb 16 21:52:28 2015	(r278868)
@@ -148,9 +148,6 @@ static struct pf_fragment *pf_find_fragm
 struct pf_frent		*pf_create_fragment(u_short *);
 static int		pf_reassemble(struct mbuf **, struct ip *, int,
 			    u_short *);
-int			pf_reassemble6(struct mbuf **, struct ip6_hdr *,
-			    struct ip6_frag *, uint16_t, uint16_t, int,
-			    u_short *);
 static struct mbuf	*pf_fragcache(struct mbuf **, struct ip*,
 			    struct pf_fragment **, int, int, int *);
 static struct pf_fragment *pf_fillup_fragment(struct pf_fragment_cmp *,
@@ -161,6 +158,9 @@ struct mbuf		*pf_join_fragment(struct pf
 
 #endif /* INET */
 #ifdef INET6
+int			pf_reassemble6(struct mbuf **, struct ip6_hdr *,
+			    struct ip6_frag *, uint16_t, uint16_t, int,
+			    u_short *);
 static void		 pf_scrub_ip6(struct mbuf **, u_int8_t);
 #endif
 #define	DPFPRINTF(x) do {				\
@@ -1094,6 +1094,7 @@ pf_fragcache(struct mbuf **m0, struct ip
 	return (NULL);
 }
 
+#ifdef INET6
 int
 pf_refragment6(struct ifnet *ifp, struct mbuf **m0, struct m_tag *mtag)
 {
@@ -1162,6 +1163,7 @@ pf_refragment6(struct ifnet *ifp, struct
 
 	return (action);
 }
+#endif /* INET6 */
 
 int
 pf_normalize_ip(struct mbuf **m0, int dir, struct pfi_kif *kif, u_short *reason,